[FFmpeg-cvslog] h264: return index in buffer on end-of-sequence.

Ronald S. Bultje git at videolan.org
Thu Jan 5 02:18:52 CET 2012


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sat Dec 31 09:12:53 2011 -0800| [400ba1d735ada65c56b1804bcc002a5cd479433b] | committer: Ronald S. Bultje

h264: return index in buffer on end-of-sequence.

Fixes hangs if the last packet contains an end-of-sequence NAL unit,
bug 158.

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

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index bb7619d..9502a7c 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);



More information about the ffmpeg-cvslog mailing list