diff options
| -rw-r--r-- | libavcodec/utils.c | 2 | ||||
| -rw-r--r-- | libavutil/frame.c | 2 | ||||
| -rw-r--r-- | libavutil/frame.h | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
4 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index dc7ffc4cec..b115da17f8 100644 --- 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 4b44075f44..4b154f3cc2 100644 --- 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 8136fb570d..d3360c4b25 100644 --- 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 3d4e036b58..e5eb196ff4 100644 --- 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 /** |