[SCM] libav/experimental: allow packets with non-zero PES_scrambling_control

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d8bee8dd1cd3349884255beaacc89c58e3cdd8fd
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Jun 19 22:20:38 2006 +0000

    allow packets with non-zero PES_scrambling_control
    
    Originally committed as revision 5499 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index b3eafe4..bf36222 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -1490,10 +1490,12 @@ static int mpegps_read_pes_header(AVFormatContext *s,
         len -= 9;
     } else if ((c & 0xc0) == 0x80) {
         /* mpeg 2 PES */
+#if 0 /* some streams have this field set for no apparent reason */
         if ((c & 0x30) != 0) {
             /* Encrypted multiplex not handled */
             goto redo;
         }
+#endif
         flags = get_byte(&s->pb);
         header_len = get_byte(&s->pb);
         len -= 2;

-- 
Libav/FFmpeg packaging