[FFmpeg-cvslog] mpeg12: print an error when there was a frame in extradata.

Michael Niedermayer git at videolan.org
Fri May 11 18:47:26 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 11 18:37:03 2012 +0200| [e20f46481bc8f51fe55e9ee1657aced939d8552f] | committer: Michael Niedermayer

mpeg12: print an error when there was a frame in extradata.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e20f46481bc8f51fe55e9ee1657aced939d8552f
---

 libavcodec/mpeg12.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index b5f914c..30456e9 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2288,7 +2288,10 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
 
     if (avctx->extradata && !avctx->frame_number) {
         int ret = decode_chunks(avctx, picture, data_size, avctx->extradata, avctx->extradata_size);
-        *data_size = 0;
+        if(*data_size) {
+            av_log(avctx, AV_LOG_ERROR, "picture in extradata\n");
+            *data_size = 0;
+        }
         if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
             return ret;
     }



More information about the ffmpeg-cvslog mailing list