diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-29 21:06:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-31 21:42:42 +0100 |
| commit | e4a714f65a0c9e03d6e5dd57a3d4a0451e193f55 (patch) | |
| tree | c9ecdec62c67f5339fe06956099dba4d0666dda4 /libavcodec/h264.c | |
| parent | 146ef3f37cb496b28a80cb25c103b694ba9804af (diff) | |
| download | ffmpeg-e4a714f65a0c9e03d6e5dd57a3d4a0451e193f55.tar.gz | |
h264: Return the correct number of bytes for mid strea, extradata.
Fixes the hang with Ticket952
Tested-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 962b5dc475..a4892ac902 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){ |