diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 12:18:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 12:18:28 +0100 |
| commit | 41135b7f64e699a71250b0c2082ba53b0338069a (patch) | |
| tree | 722cfb318703cc777579faa3d1996f8c340d35cf /libavcodec | |
| parent | 40ea3438661e6cc30b60bc019ae01fb073eabb35 (diff) | |
| parent | b2fe6756e34d1316d0fa799e8a5ace993059c407 (diff) | |
| download | ffmpeg-41135b7f64e699a71250b0c2082ba53b0338069a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: add option for dithering during sample format conversion to s16
mpeg12: do not decode extradata more than once.
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg12.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpeg12.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 8aa836e7bb..8f028f3b5c 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2558,13 +2558,13 @@ static int mpeg_decode_frame(AVCodecContext *avctx, s->slice_count = 0; - if (avctx->extradata && !s->parsed_extra) { + if (avctx->extradata && !s->extradata_decoded) { ret = decode_chunks(avctx, picture, got_output, avctx->extradata, avctx->extradata_size); if(*got_output) { av_log(avctx, AV_LOG_ERROR, "picture in extradata\n"); *got_output = 0; } - s->parsed_extra = 1; + s->extradata_decoded = 1; if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) { s2->current_picture_ptr = NULL; return ret; diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index c8cec48d7f..6e60c8695f 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -42,7 +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; + int extradata_decoded; } Mpeg1Context; extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; |