diff options
author | Måns Rullgård <mans@mansr.com> | 2006-06-19 22:20:38 +0000 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2006-06-19 22:20:38 +0000 |
commit | d8bee8dd1cd3349884255beaacc89c58e3cdd8fd (patch) | |
tree | 92714bb96c6302d60c162caab40797c964d98615 | |
parent | aa1c1c615aa922e1f5867b3143278580d2b43bc6 (diff) | |
download | ffmpeg-d8bee8dd1cd3349884255beaacc89c58e3cdd8fd.tar.gz |
allow packets with non-zero PES_scrambling_control
Originally committed as revision 5499 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavformat/mpeg.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |