[FFmpeg-cvslog] direcdec: fix infinite loop

Michael Niedermayer git at videolan.org
Sun Apr 1 16:29:15 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  1 16:11:29 2012 +0200| [6a052e64b5d14ce2800eb45c699857347d9a78c9] | committer: Michael Niedermayer

direcdec: fix infinite loop

Fixes Ticket1156

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

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

 libavcodec/diracdec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index f9aace9..5c4ed88 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -1870,7 +1870,7 @@ static int dirac_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     }
 
     if (!s->current_picture)
-        return 0;
+        return buf_size;
 
     if (s->current_picture->avframe.display_picture_number > s->frame_number) {
         DiracFrame *delayed_frame = remove_frame(s->delay_frames, s->frame_number);



More information about the ffmpeg-cvslog mailing list