From 400ba1d735ada65c56b1804bcc002a5cd479433b Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 31 Dec 2011 09:12:53 -0800 Subject: h264: return index in buffer on end-of-sequence. Fixes hangs if the last packet contains an end-of-sequence NAL unit, bug 158. --- libavcodec/h264.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index bb7619dee2..9502a7c147 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4008,7 +4008,7 @@ static int decode_frame(AVCodecContext *avctx, H264Context *h = avctx->priv_data; MpegEncContext *s = &h->s; AVFrame *pict = data; - int buf_index; + int buf_index = 0; s->flags= avctx->flags; s->flags2= avctx->flags2; @@ -4038,7 +4038,7 @@ static int decode_frame(AVCodecContext *avctx, *pict= *(AVFrame*)out; } - return 0; + return buf_index; } buf_index=decode_nal_units(h, buf, buf_size); -- cgit v1.2.3