diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 19:13:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-17 01:15:31 +0200 |
| commit | a80e622924c89df69fb1c225ba432fe12fe6648e (patch) | |
| tree | d2d8f5a4cc4792bc0f6bb8dfd772091a5ed7a192 /libavutil/frame.c | |
| parent | 0092bcdf06f240deed890c0d29a95b86f82fe2ee (diff) | |
| download | ffmpeg-a80e622924c89df69fb1c225ba432fe12fe6648e.tar.gz | |
avcodec/avutil: Add AVColorSpace and AVColorRange to AVFrames
This also moves AVColorSpace and AVColorRange from avcodec to avutil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/frame.c')
| -rw-r--r-- | libavutil/frame.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 3141dec72e..bac6c63980 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -40,6 +40,8 @@ MAKE_ACCESSORS(AVFrame, frame, int, sample_rate) MAKE_ACCESSORS(AVFrame, frame, AVDictionary *, metadata) MAKE_ACCESSORS(AVFrame, frame, int, decode_error_flags) MAKE_ACCESSORS(AVFrame, frame, int, pkt_size) +MAKE_ACCESSORS(AVFrame, frame, enum AVColorSpace, colorspace) +MAKE_ACCESSORS(AVFrame, frame, enum AVColorRange, color_range) #define CHECK_CHANNELS_CONSISTENCY(frame) \ av_assert2(!(frame)->channel_layout || \ @@ -89,6 +91,7 @@ static void get_frame_defaults(AVFrame *frame) frame->key_frame = 1; frame->sample_aspect_ratio = (AVRational){ 0, 1 }; frame->format = -1; /* unknown */ + frame->colorspace = AVCOL_SPC_UNSPECIFIED; frame->extended_data = frame->data; } @@ -456,6 +459,8 @@ 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->decode_error_flags = src->decode_error_flags; + dst->colorspace = src->colorspace; + dst->color_range = dst->color_range; av_dict_copy(&dst->metadata, src->metadata, 0); |