From 985c5f226af35fff00a86bc36cc8eaa8da3d23b0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 10 Dec 2013 01:00:01 +0100 Subject: [PATCH] avcodec/utils: check that extended data has been set correctly instead of forcing it in avcodec_decode_video2() Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; }