diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 12:16:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 12:16:03 +0200 |
| commit | 63f0708478e11713ca405ac3d4fa59c62ab210cc (patch) | |
| tree | 22d278469ccf04ed81e5fe3ff74c7634317e64f2 | |
| parent | 9c020810c1d04e2983fff9171104062f9471805a (diff) | |
| download | ffmpeg-63f0708478e11713ca405ac3d4fa59c62ab210cc.tar.gz | |
h264: Support invalid output by mplayers TS demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 6ec77f5b44..b353bee474 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3941,9 +3941,10 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ break; case NAL_SPS: init_get_bits(&s->gb, ptr, bit_length); - if(ff_h264_decode_seq_parameter_set(h) < 0 && h->is_avc && (nalsize != consumed) && nalsize){ + if(ff_h264_decode_seq_parameter_set(h) < 0 && (h->is_avc ? (nalsize != consumed) && nalsize : 1)){ av_log(h->s.avctx, AV_LOG_DEBUG, "SPS decoding failure, trying alternative mode\n"); - init_get_bits(&s->gb, &buf[buf_index + 1 - consumed], 8*nalsize); + if(h->is_avc) av_assert0(next_avc - buf_index + consumed == nalsize); + init_get_bits(&s->gb, &buf[buf_index + 1 - consumed], 8*(next_avc - buf_index + consumed)); ff_h264_decode_seq_parameter_set(h); } |