diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 23:38:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 23:38:41 +0200 |
| commit | 34b78ad04fe3b46a4658f011c776550110be7dc0 (patch) | |
| tree | a92b5e50c4392c23203621c57f90edd1727670d5 /libavcodec/x86/mpegvideoenc.c | |
| parent | ed3680bc9b8f7458ed62d252e2da0e141faa0377 (diff) | |
| parent | a3cb865310cc10927e90d7b44d65e3a95af547b6 (diff) | |
| download | ffmpeg-34b78ad04fe3b46a4658f011c776550110be7dc0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Move some ifdefs to avoid unused variable warnings
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/mpegvideoenc.c')
0 files changed, 0 insertions, 0 deletions