aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-01 16:11:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-01 16:11:29 +0200
commit6a052e64b5d14ce2800eb45c699857347d9a78c9 (patch)
treef81bb7b8e8b68abab6e1d599c07902cae37a41ca
parent7a3df014b9ba134aff85cb2778daebd497d8c79a (diff)
downloadffmpeg-6a052e64b5d14ce2800eb45c699857347d9a78c9.tar.gz
direcdec: fix infinite loop
Fixes Ticket1156 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/diracdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index f9aace9567..5c4ed889d3 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);