[FFmpeg-devel] [PATCH] h264: Return the correct number of bytes for mid strea, extradata.

Michael Niedermayer michaelni at gmx.at
Sun Jan 29 21:09:13 CET 2012


Fixes the hang with Ticket952

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavcodec/h264.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 962b5dc..a4892ac 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1125,7 +1125,7 @@ int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size)
         if(decode_nal_units(h, buf, size) < 0)
             return -1;
     }
-    return 0;
+    return size;
 }
 
 av_cold int ff_h264_decode_init(AVCodecContext *avctx){
@@ -1170,7 +1170,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx){
     }
 
     if(avctx->extradata_size > 0 && avctx->extradata &&
-        ff_h264_decode_extradata(h, avctx->extradata, avctx->extradata_size))
+        ff_h264_decode_extradata(h, avctx->extradata, avctx->extradata_size)<0)
         return -1;
 
     if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames < h->sps.num_reorder_frames){
-- 
1.7.5.4



More information about the ffmpeg-devel mailing list