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:
7102083
)
avcodec/utils: check that extended data has been set correctly instead of forcing...
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 10 Dec 2013 00:00:01 +0000
(
01:00
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 10 Dec 2013 00:11:32 +0000
(
01:11
+0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c
patch
|
blob
|
history
diff --git
a/libavcodec/utils.c
b/libavcodec/utils.c
index
ee873d7
..
dd3f112
100644
(file)
--- a/
libavcodec/utils.c
+++ b/
libavcodec/utils.c
@@
-2158,7
+2158,7
@@
fail:
/* many decoders assign whole AVFrames, thus overwriting extended_data;
* make sure it's set correctly */
-
picture->extended_data = picture->data
;
+
av_assert0(!picture->extended_data || picture->extended_data == picture->data)
;
return ret;
}