diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 10:56:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 10:56:10 +0200 |
commit | c88503e3f6bd7881f147d340bf222a629daa55fc (patch) | |
tree | b8feb316bc6924f9b648b7e57f6faa1dd6afe248 /libswscale/sparc | |
parent | 8740762c43dc92cfefa58769bb8cfade82aa695c (diff) | |
parent | 439902e0d68a0f0d800c21b5e6b598d5fa0c51da (diff) | |
download | ffmpeg-c88503e3f6bd7881f147d340bf222a629daa55fc.tar.gz |
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>
Diffstat (limited to 'libswscale/sparc')
0 files changed, 0 insertions, 0 deletions