diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-07-21 13:10:53 -0700 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-21 15:08:01 -0700 |
| commit | 78670fbf07bd03479073d4218440de4914304680 (patch) | |
| tree | b29e67e63f01755c410f65a7860950d1f15fe425 | |
| parent | 6869612f5c7d4d2f20f69a5658328a761deadb1c (diff) | |
| download | ffmpeg-78670fbf07bd03479073d4218440de4914304680.tar.gz | |
imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery
| -rw-r--r-- | libavcodec/imgconvert.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 196bf5fae0..365dc54c57 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -39,14 +39,6 @@ #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" -#if HAVE_MMX_EXTERNAL -#define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx -#define deinterlace_line ff_deinterlace_line_mmx -#else -#define deinterlace_line_inplace deinterlace_line_inplace_c -#define deinterlace_line deinterlace_line_c -#endif - void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); @@ -346,7 +338,13 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, #if FF_API_DEINTERLACE -#if !HAVE_MMX_EXTERNAL +#if HAVE_MMX_EXTERNAL +#define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx +#define deinterlace_line ff_deinterlace_line_mmx +#else +#define deinterlace_line_inplace deinterlace_line_inplace_c +#define deinterlace_line deinterlace_line_c + /* filter parameters: [-1 4 2 4 -1] // 8 */ static void deinterlace_line_c(uint8_t *dst, const uint8_t *lum_m4, const uint8_t *lum_m3, |