diff options
| author | wm4 <wm4@nowhere> | 2015-03-03 12:28:46 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-03-03 12:28:46 +0100 |
| commit | c31e5da734b4bd386e675926037d938b82671922 (patch) | |
| tree | fd9c70715b32dd9b67364e1fe285b0eb78430e24 /video/mp_image.c | |
| parent | 5808f1c408be958e90a302f42610fc59dfa0c373 (diff) | |
| download | mpv-c31e5da734b4bd386e675926037d938b82671922.tar.bz2 mpv-c31e5da734b4bd386e675926037d938b82671922.tar.xz | |
Remove some FFmpeg/Libav compatibility hacks
All of these are now in the supported FFmpeg and Libav versions.
The 3 remaining API checks are for FFmpeg-only things.
Diffstat (limited to 'video/mp_image.c')
| -rw-r--r-- | video/mp_image.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/video/mp_image.c b/video/mp_image.c index fcf265f699..c82fe0e21c 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -645,9 +645,6 @@ void mp_image_copy_fields_from_av_frame(struct mp_image *dst, } -// Not strictly related, but was added in a similar timeframe. -#define HAVE_AVFRAME_COLORSPACE HAVE_AVCODEC_CHROMA_POS_API - // Copy properties and data of the mp_image into the AVFrame, without taking // care of memory management issues. void mp_image_copy_fields_to_av_frame(struct AVFrame *dst, @@ -671,10 +668,8 @@ void mp_image_copy_fields_to_av_frame(struct AVFrame *dst, if (src->fields & MP_IMGFIELD_REPEAT_FIRST) dst->repeat_pict = 1; -#if HAVE_AVFRAME_COLORSPACE dst->colorspace = mp_csp_to_avcol_spc(src->params.colorspace); dst->color_range = mp_csp_levels_to_avcol_range(src->params.colorlevels); -#endif } static void frame_free(void *p) |