diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:17:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:17:54 +0100 |
| commit | d6d3cfb0aa23c1f6111f71889256874d86c2cf77 (patch) | |
| tree | d8bc1f0e3b4c07264d07f6f95b030db68b3df829 /libavcodec/libfaac.c | |
| parent | 8fbc6e59118d2cc10a712ea8de0e10d2d984bcee (diff) | |
| parent | 600b854ad8173995518bd917e7f86120b5505088 (diff) | |
| download | ffmpeg-d6d3cfb0aa23c1f6111f71889256874d86c2cf77.tar.gz | |
Merge commit '600b854ad8173995518bd917e7f86120b5505088'
* commit '600b854ad8173995518bd917e7f86120b5505088':
imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil
Conflicts:
libavcodec/imgconvert.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfaac.c')
0 files changed, 0 insertions, 0 deletions