diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-27 11:52:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-27 11:59:39 +0200 |
| commit | 6999f8bcf56bb167124bf85bdaa89090acdd5d9c (patch) | |
| tree | 5bfb541bec48db787901f2441bd887d3629737ea /libavcodec/rv34.c | |
| parent | ab31db06103c6ac0c1bd1f9fdfa93220d8801e19 (diff) | |
| parent | 904100e5fc13dacc954b1d093bf87bc44f4e7a7b (diff) | |
| download | ffmpeg-6999f8bcf56bb167124bf85bdaa89090acdd5d9c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
make av_interleaved_write_frame() flush packets when pkt is NULL
mpegts: Fix dead error checks
vc1: Do not read from array if index is invalid.
targa: convert to bytestream2.
rv34: set mb_num_left to 0 after finishing a frame
Conflicts:
libavcodec/targa.c
libavcodec/vc1data.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 1944de094f..235b3ed0bc 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1580,6 +1580,7 @@ static int finish_frame(AVCodecContext *avctx, AVFrame *pict) ff_er_frame_end(s); ff_MPV_frame_end(s); + s->mb_num_left = 0; if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME)) ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 0); @@ -1778,6 +1779,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, * only complete frames */ ff_er_frame_end(s); ff_MPV_frame_end(s); + s->mb_num_left = 0; ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 0); return AVERROR_INVALIDDATA; } |