OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ab059f0
)
frame: Remove some FF_API_AVFRAME_COLORSPACE leftovers
author
Diego Biurrun
<diego@biurrun.de>
Wed, 13 Aug 2014 20:35:47 +0000
(22:35 +0200)
committer
Diego Biurrun
<diego@biurrun.de>
Thu, 14 Aug 2014 07:44:47 +0000
(
00:44
-0700)
libavutil/frame.c
patch
|
blob
|
history
diff --git
a/libavutil/frame.c
b/libavutil/frame.c
index
4b154f3
..
48df311
100644
(file)
--- 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));