diff options
| author | Rocky Bernstein <rockyb@users.sourceforge.net> | 2003-05-07 02:16:59 +0000 |
|---|---|---|
| committer | Rocky Bernstein <rockyb@users.sourceforge.net> | 2003-05-07 02:16:59 +0000 |
| commit | 8f5443980f4c01f7b8020b318752233e52f0931e (patch) | |
| tree | 5607a225ec759d8ad4c4aacde7f8ab8ee2614422 | |
| parent | e82716c66695961477ff6c23bfef7cd6ef5a5e27 (diff) | |
| download | xine-lib-8f5443980f4c01f7b8020b318752233e52f0931e.tar.gz xine-lib-8f5443980f4c01f7b8020b318752233e52f0931e.tar.bz2 | |
Even better test for PES scrambling.
CVS patchset: 4792
CVS date: 2003/05/07 02:16:59
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 2124ef9fc..8e62591a3 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_block.c,v 1.176 2003/05/07 02:04:31 rockyb Exp $ + * $Id: demux_mpeg_block.c,v 1.177 2003/05/07 02:16:59 rockyb Exp $ * * demultiplexer for mpeg 1/2 program streams * used with fixed blocksize devices (like dvd/vcd) @@ -447,7 +447,8 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m } else { /* mpeg 2 */ #if CHECK_DVD_PES_SCRAMBLED /* check PES scrambling_control */ - if (((p[6] & 0xF0) != 80) ) { + + if ((p[6] & 0x80) == 80 && (p[6] & 30) != 0) { xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_mpeg_block: warning: PES header indicates that this stream may be encrypted (encryption mode %d)\n"), (p[6] & 0x30) >> 4); |