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)
commitc88503e3f6bd7881f147d340bf222a629daa55fc
treeb8feb316bc6924f9b648b7e57f6faa1dd6afe248
parent8740762c43dc92cfefa58769bb8cfade82aa695c
parent439902e0d68a0f0d800c21b5e6b598d5fa0c51da
Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'

* commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da':
  Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/

Conflicts:
compat/aix/math.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
compat/aix/math.h
compat/tms470/math.h
compat/w32pthreads.h