generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.

Browse Source
This commit is contained in:
Anton Khirnov 2014-08-06 19:58:57 +00:00
parent 1985c2e75c
commit 472f9ed312
4 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/utils.c
View File

@ -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) {

2
libavutil/frame.c
View File

@ -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)

2
libavutil/frame.h
View File

@ -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;
/**

3
libavutil/version.h
View File

@ -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
/**