diff options
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index f197b4421..2124ef9fc 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.175 2003/05/02 20:48:35 miguelfreitas Exp $ + * $Id: demux_mpeg_block.c,v 1.176 2003/05/07 02:04:31 rockyb Exp $ * * demultiplexer for mpeg 1/2 program streams * used with fixed blocksize devices (like dvd/vcd) @@ -445,20 +445,15 @@ 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] & 0x30) != 0) ) { + if (((p[6] & 0xF0) != 80) ) { 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); + _("demux_mpeg_block: warning: PES header indicates that this stream may be encrypted (encryption mode %d)\n"), (p[6] & 0x30) >> 4); this->warned++; - if (this->warned > 5) { - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_mpeg_block: too many errors, stopping playback. Maybe this stream is scrambled?\n")); - this->status = DEMUX_FINISHED; - xine_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE, "Playback aborted", NULL); - } - } +#endif if (p[7] & 0x80) { /* pts avail */ |