diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 01:17:54 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 01:17:54 +0400 |
| commit | d6d3cfb0aa23c1f6111f71889256874d86c2cf77 (patch) | |
| tree | d8bc1f0e3b4c07264d07f6f95b030db68b3df829 /libavcodec/imgconvert.c | |
| parent | 8fbc6e59118d2cc10a712ea8de0e10d2d984bcee (diff) | |
| parent | 600b854ad8173995518bd917e7f86120b5505088 (diff) | |
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/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 35f7c1073c..64510f3746 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -40,10 +40,6 @@ #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" -#if HAVE_MMX_EXTERNAL -#include "x86/dsputil_x86.h" -#endif - #define FF_COLOR_NA -1 #define FF_COLOR_RGB 0 /**< RGB color space */ #define FF_COLOR_GRAY 1 /**< gray color space */ |