Merge commit '600b854ad8173995518bd917e7f86120b5505088'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 21:17:54 +0000 (22:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 21:17:54 +0000 (22:17 +0100)
* 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>
1  2 
libavcodec/imgconvert.c
libavcodec/imgconvert.h
libavcodec/x86/dsputil_x86.h

  #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 */
 +#define FF_COLOR_YUV      2 /**< YUV color space. 16 <= Y <= 235, 16 <= U, V <= 240 */
 +#define FF_COLOR_YUV_JPEG 3 /**< YUV color space. 0 <= Y <= 255, 0 <= U, V <= 255 */
 +
  #if HAVE_MMX_EXTERNAL
  #define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx
  #define deinterlace_line         ff_deinterlace_line_mmx
Simple merge
@@@ -96,22 -91,6 +96,10 @@@ void ff_put_pixels8_xy2_mmx(uint8_t *bl
  void ff_put_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
                               ptrdiff_t line_size, int h);
  
- void ff_deinterlace_line_mmx(uint8_t *dst,
-                              const uint8_t *lum_m4, const uint8_t *lum_m3,
-                              const uint8_t *lum_m2, const uint8_t *lum_m1,
-                              const uint8_t *lum,
-                              int size);
- void ff_deinterlace_line_inplace_mmx(const uint8_t *lum_m4,
-                                      const uint8_t *lum_m3,
-                                      const uint8_t *lum_m2,
-                                      const uint8_t *lum_m1,
-                                      const uint8_t *lum, int size);
 +
 +void ff_mmx_idct(int16_t *block);
 +void ff_mmxext_idct(int16_t *block);
 +
  #define PIXELS16(STATIC, PFX1, PFX2, TYPE, CPUEXT)                      \
  STATIC void PFX1 ## _pixels16 ## TYPE ## CPUEXT(uint8_t *block,         \
                                                  const uint8_t *pixels,  \