diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 18:37:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 18:46:56 +0200 |
| commit | de1824e970d448a84bedce4936c301c322baa714 (patch) | |
| tree | a36ef4a1f2cc5e156751f874cd056a5fe2d0afde | |
| parent | e20f46481bc8f51fe55e9ee1657aced939d8552f (diff) | |
| download | ffmpeg-de1824e970d448a84bedce4936c301c322baa714.tar.gz | |
mpeg12: fix logic that prevents extradata from being parsed twice.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg12.c | 3 | ||||
| -rw-r--r-- | libavcodec/mpeg12.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 30456e9036..c7118a592c 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2286,12 +2286,13 @@ static int mpeg_decode_frame(AVCodecContext *avctx, s->slice_count = 0; - if (avctx->extradata && !avctx->frame_number) { + if (avctx->extradata && !s->parsed_extra) { int ret = decode_chunks(avctx, picture, data_size, avctx->extradata, avctx->extradata_size); if(*data_size) { av_log(avctx, AV_LOG_ERROR, "picture in extradata\n"); *data_size = 0; } + s->parsed_extra = 1; if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) return ret; } diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 9a9cc85dee..c8cec48d7f 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -42,6 +42,7 @@ typedef struct Mpeg1Context { AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator int sync; ///< Did we reach a sync point like a GOP/SEQ/KEYFrame? int tmpgexs; + int parsed_extra; } Mpeg1Context; extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; |