From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 13 Aug 2014 20:35:47 +0000 (+0200)
Subject: frame: Remove some FF_API_AVFRAME_COLORSPACE leftovers
X-Git-Tag: android-x86-6.0-r1~10^2~936
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e070d0a5ca9047192e324a3f87006b316e2a08a7;p=android-x86%2Fexternal-ffmpeg.git

frame: Remove some FF_API_AVFRAME_COLORSPACE leftovers
---

diff --git a/libavutil/frame.c b/libavutil/frame.c
index 4b154f3cc2..48df311dd2 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -385,13 +385,11 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
     dst->coded_picture_number   = src->coded_picture_number;
     dst->display_picture_number = src->display_picture_number;
     dst->flags                  = src->flags;
-#if FF_API_AVFRAME_COLORSPACE
     dst->color_primaries        = src->color_primaries;
     dst->color_trc              = src->color_trc;
     dst->colorspace             = src->colorspace;
     dst->color_range            = src->color_range;
     dst->chroma_location        = src->chroma_location;
-#endif
 
     memcpy(dst->error, src->error, sizeof(dst->error));