Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index dc7ffc4cec27841ed5363246d6b352c0d302c7ed..b115da17f8ba9ef3a34ff3868782cd40852276ec 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -576,13 +576,11 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
     int size;
     AVFrameSideData *frame_sd;
 
-#if FF_API_AVFRAME_COLORSPACE
     frame->color_primaries = avctx->color_primaries;
     frame->color_trc       = avctx->color_trc;
     frame->colorspace      = avctx->colorspace;
     frame->color_range     = avctx->color_range;
     frame->chroma_location = avctx->chroma_sample_location;
-#endif
 
     frame->reordered_opaque = avctx->reordered_opaque;
     if (!pkt) {

diff --git a/libavutil/frame.c b/libavutil/frame.c
index 4b44075f44c96d966a8d3ab5128f34ef538ca6d0..4b154f3cc2352008aeb6242b87dfe577419617ff 100644 (file)
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -38,13 +38,11 @@ static void get_frame_defaults(AVFrame *frame)
     frame->sample_aspect_ratio = (AVRational){ 0, 1 };
     frame->format              = -1; /* unknown */
     frame->extended_data       = frame->data;
-#if FF_API_AVFRAME_COLORSPACE
     frame->color_primaries     = AVCOL_PRI_UNSPECIFIED;
     frame->color_trc           = AVCOL_TRC_UNSPECIFIED;
     frame->colorspace          = AVCOL_SPC_UNSPECIFIED;
     frame->color_range         = AVCOL_RANGE_UNSPECIFIED;
     frame->chroma_location     = AVCHROMA_LOC_UNSPECIFIED;
-#endif
 }
 
 static void free_side_data(AVFrameSideData **ptr_sd)

diff --git a/libavutil/frame.h b/libavutil/frame.h
index 8136fb570dccbda0a8524eab653d0bfe9f63d311..d3360c4b252748aa6cc6d701c12182a9410ea79d 100644 (file)
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -433,7 +433,6 @@ typedef struct AVFrame {
      */
     int flags;
 
-#if FF_API_AVFRAME_COLORSPACE
     enum AVColorRange color_range;
 
     enum AVColorPrimaries color_primaries;
@@ -443,7 +442,6 @@ typedef struct AVFrame {
     enum AVColorSpace colorspace;
 
     enum AVChromaLocation chroma_location;
-#endif
 } AVFrame;
 
 /**

diff --git a/libavutil/version.h b/libavutil/version.h
index 3d4e036b582d66c4ee8d40856b1a3cb3ad056554..e5eb196ff4cc2aec00cbea3c9b64f1725fe782c4 100644 (file)
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -111,9 +111,6 @@
 #ifndef FF_API_OPT_TYPE_METADATA
 #define FF_API_OPT_TYPE_METADATA        (LIBAVUTIL_VERSION_MAJOR < 55)
 #endif
-#ifndef FF_API_AVFRAME_COLORSPACE
-#define FF_API_AVFRAME_COLORSPACE       (LIBAVUTIL_VERSION_MAJOR >= 54)
-#endif
 
 
 /**