From c31e5da734b4bd386e675926037d938b82671922 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 3 Mar 2015 12:28:46 +0100
Subject: 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.
---
 video/csputils.c     | 8 --------
 video/decode/vdpau.c | 4 ----
 video/image_writer.c | 2 --
 video/mp_image.c     | 5 -----
 4 files changed, 19 deletions(-)

(limited to 'video')

diff --git a/video/csputils.c b/video/csputils.c
index cbd9734819..cee33dbba9 100644
--- a/video/csputils.c
+++ b/video/csputils.c
@@ -113,10 +113,8 @@ enum mp_csp avcol_spc_to_mp_csp(int avcolorspace)
     switch (avcolorspace) {
     case AVCOL_SPC_BT709:       return MP_CSP_BT_709;
     case AVCOL_SPC_BT470BG:     return MP_CSP_BT_601;
-#if HAVE_AVCOL_SPC_BT2020
     case AVCOL_SPC_BT2020_NCL:  return MP_CSP_BT_2020_NC;
     case AVCOL_SPC_BT2020_CL:   return MP_CSP_BT_2020_C;
-#endif
     case AVCOL_SPC_SMPTE170M:   return MP_CSP_BT_601;
     case AVCOL_SPC_SMPTE240M:   return MP_CSP_SMPTE_240M;
     case AVCOL_SPC_RGB:         return MP_CSP_RGB;
@@ -141,9 +139,7 @@ enum mp_csp_prim avcol_pri_to_mp_csp_prim(int avpri)
     case AVCOL_PRI_SMPTE170M:   return MP_CSP_PRIM_BT_601_525;
     case AVCOL_PRI_BT470BG:     return MP_CSP_PRIM_BT_601_625;
     case AVCOL_PRI_BT709:       return MP_CSP_PRIM_BT_709;
-#if HAVE_AVCOL_SPC_BT2020
     case AVCOL_PRI_BT2020:      return MP_CSP_PRIM_BT_2020;
-#endif
     case AVCOL_PRI_BT470M:      return MP_CSP_PRIM_BT_470M;
     default:                    return MP_CSP_PRIM_AUTO;
     }
@@ -169,10 +165,8 @@ int mp_csp_to_avcol_spc(enum mp_csp colorspace)
     switch (colorspace) {
     case MP_CSP_BT_709:         return AVCOL_SPC_BT709;
     case MP_CSP_BT_601:         return AVCOL_SPC_BT470BG;
-#if HAVE_AVCOL_SPC_BT2020
     case MP_CSP_BT_2020_NC:     return AVCOL_SPC_BT2020_NCL;
     case MP_CSP_BT_2020_C:      return AVCOL_SPC_BT2020_CL;
-#endif
     case MP_CSP_SMPTE_240M:     return AVCOL_SPC_SMPTE240M;
     case MP_CSP_RGB:            return AVCOL_SPC_RGB;
     case MP_CSP_YCGCO:          return AVCOL_SPC_YCOCG;
@@ -195,9 +189,7 @@ int mp_csp_prim_to_avcol_pri(enum mp_csp_prim prim)
     case MP_CSP_PRIM_BT_601_525: return AVCOL_PRI_SMPTE170M;
     case MP_CSP_PRIM_BT_601_625: return AVCOL_PRI_BT470BG;
     case MP_CSP_PRIM_BT_709:     return AVCOL_PRI_BT709;
-#if HAVE_AVCOL_SPC_BT2020
     case MP_CSP_PRIM_BT_2020:    return AVCOL_PRI_BT2020;
-#endif
     case MP_CSP_PRIM_BT_470M:    return AVCOL_PRI_BT470M;
     default:                     return AVCOL_PRI_UNSPECIFIED;
     }
diff --git a/video/decode/vdpau.c b/video/decode/vdpau.c
index 92ea401750..43be1f47c1 100644
--- a/video/decode/vdpau.c
+++ b/video/decode/vdpau.c
@@ -157,11 +157,7 @@ static int init(struct lavc_ctx *ctx)
     };
     ctx->hwdec_priv = p;
 
-#if HAVE_AVCODEC_VDPAU_ALLOC_CONTEXT
     p->context = av_vdpau_alloc_context();
-#else
-    p->context = av_mallocz(sizeof(AVVDPAUContext));
-#endif
     if (!p->context)
         goto error;
 
diff --git a/video/image_writer.c b/video/image_writer.c
index 700e1c4284..ab00b5bb01 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -133,12 +133,10 @@ static int write_lavc(struct image_writer_ctx *ctx, mp_image_t *image, FILE *fp)
     pic->format = avctx->pix_fmt;
     pic->width = avctx->width;
     pic->height = avctx->height;
-#if HAVE_AVFRAME_CSP
     if (ctx->opts->tag_csp) {
         pic->color_primaries = mp_csp_prim_to_avcol_pri(image->params.primaries);
         pic->color_trc = mp_csp_trc_to_avcol_trc(image->params.gamma);
     }
-#endif
     int ret = avcodec_encode_video2(avctx, &pkt, pic, &got_output);
     if (ret < 0)
         goto error_exit;
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)
-- 
cgit v1.2.3