summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-10 01:00:01 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-10 01:11:32 +0100
commit985c5f226af35fff00a86bc36cc8eaa8da3d23b0 (patch)
treee1203df33de9b1be458449cdaf74a6e5d16f65d0 /libavcodec
parent7102083a26f77b316b78d985c6b86f6d955910b9 (diff)
avcodec/utils: check that extended data has been set correctly instead of forcing it in avcodec_decode_video2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index ee873d7f04..dd3f112ef8 100644
--- 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;
}