diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-08-06 19:58:57 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-08-09 16:59:13 +0000 |
| commit | 472f9ed312ec784f7c72876b77163f4741880d05 (patch) | |
| tree | 2aa508dfe9d0467f653741f40958a90e29cd66a6 /libavutil | |
| parent | 1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8 (diff) | |
Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.c | 2 | ||||
| -rw-r--r-- | libavutil/frame.h | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 0 insertions, 7 deletions
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 /** |