Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Jul 2013 08:56:10 +0000 (10:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Jul 2013 08:56:10 +0000 (10:56 +0200)
* commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da':
  Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/

Conflicts:
compat/aix/math.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

No differences found