diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:21:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:29:24 +0200 |
| commit | 287602f9d80f4a816c0e9a3a9c0d810de8dc94cb (patch) | |
| tree | 06bd62c1fe2e58ca1bd2578fe5effe60e60f9a28 /libavcodec | |
| parent | 97f8c7a03eddacd9b6450423cc21a801e002f01f (diff) | |
| parent | 472f9ed312ec784f7c72876b77163f4741880d05 (diff) | |
Merge commit '472f9ed312ec784f7c72876b77163f4741880d05'
* commit '472f9ed312ec784f7c72876b77163f4741880d05':
Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.
Conflicts:
libavcodec/utils.c
libavutil/frame.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 6071380c40..0bc0b3888f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -780,7 +780,6 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) } frame->reordered_opaque = avctx->reordered_opaque; -#if FF_API_AVFRAME_COLORSPACE if (frame->color_primaries == AVCOL_PRI_UNSPECIFIED) frame->color_primaries = avctx->color_primaries; if (frame->color_trc == AVCOL_TRC_UNSPECIFIED) @@ -791,7 +790,6 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) av_frame_set_color_range(frame, avctx->color_range); if (frame->chroma_location == AVCHROMA_LOC_UNSPECIFIED) frame->chroma_location = avctx->chroma_sample_location; -#endif switch (avctx->codec->type) { case AVMEDIA_TYPE_VIDEO: |