Support invalid mpeg created by vdr
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2008 00:12:49 +0000 (00:12 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2008 00:12:49 +0000 (00:12 +0000)
(http://www.lucke.in-berlin.de/test_streams/last_played_fine_with_r7852_001.vdr).
fixes issue434

Originally committed as revision 13014 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/mpeg.c

index 462ef73..480c054 100644 (file)
@@ -341,12 +341,13 @@ static int mpegps_read_pes_header(AVFormatContext *s,
         if (flags & 0x01) { /* PES extension */
             pes_ext = get_byte(s->pb);
             header_len--;
-            if (pes_ext & 0x40) { /* pack header - should be zero in PS */
-                goto error_redo;
-            }
             /* Skip PES private data, program packet sequence counter and P-STD buffer */
             skip = (pes_ext >> 4) & 0xb;
             skip += skip & 0x9;
+            if (pes_ext & 0x40 || skip > header_len){
+                av_log(s, AV_LOG_WARNING, "pes_ext %X is invalid\n", pes_ext);
+                pes_ext=skip=0;
+            }
             url_fskip(s->pb, skip);
             header_len -= skip;