From d8bee8dd1cd3349884255beaacc89c58e3cdd8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Mon, 19 Jun 2006 22:20:38 +0000 Subject: [PATCH] allow packets with non-zero PES_scrambling_control Originally committed as revision 5499 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mpeg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index b3eafe459d..bf36222760 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;