[FFmpeg-cvslog] h264: Support invalid output by mplayers TS demuxer.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 24 12:16:03 2011 +0200| [63f0708478e11713ca405ac3d4fa59c62ab210cc] | committer: Michael Niedermayer

h264: Support invalid output by mplayers TS demuxer.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 6ec77f5..b353bee 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);
             }