diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 12:54:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 12:55:11 +0200 |
| commit | 4ec1cb24978e201062408ffebad18d8ef906a46d (patch) | |
| tree | 203f149e748fc6570ced679bd6e5cacb79bd4605 /libavcodec/imgconvert.c | |
| parent | 7cdb3b2b79d78b7b3e686b3a53e904b4656d461f (diff) | |
| parent | 78670fbf07bd03479073d4218440de4914304680 (diff) | |
Merge commit '78670fbf07bd03479073d4218440de4914304680'
* commit '78670fbf07bd03479073d4218440de4914304680':
imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imgconvert.c')
| -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 27c984a670..158bc739a1 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -40,14 +40,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); @@ -297,7 +289,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, |