summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Courtier-Dutton <jcdutton@users.sourceforge.net>2001-10-06 11:54:49 +0000
committerJames Courtier-Dutton <jcdutton@users.sourceforge.net>2001-10-06 11:54:49 +0000
commit779e451877d2de9756e9bf1f9990ff933641bc4f (patch)
tree3ee8585fd137c3320c9c72d3cdb83610d171adf9
parent429d31eb39ef7b18203499268d4f94e463ea31af (diff)
downloadxine-lib-779e451877d2de9756e9bf1f9990ff933641bc4f.tar.gz
xine-lib-779e451877d2de9756e9bf1f9990ff933641bc4f.tar.bz2
Added check for encrypted streams.
CVS patchset: 746 CVS date: 2001/10/06 11:54:49
-rw-r--r--src/demuxers/demux_mpeg_block.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 475b4f084..8d1815633 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.49 2001/10/05 17:19:31 jkeil Exp $
+ * $Id: demux_mpeg_block.c,v 1.50 2001/10/06 11:54:49 jcdutton Exp $
*
* demultiplexer for mpeg 1/2 program streams
*
@@ -281,7 +281,12 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
}
} else { /* mpeg 2 */
-
+ if ((p[6] & 0x30) != 0) {
+ printf("demux_mpeg_block:Encrypted PES MPEG2 stream.\n");
+ printf(" You will need to find an input plugin which can decrypt.\n");
+ buf->free_buffer(buf);
+ return;
+ }
if (p[7] & 0x80) { /* PTS avail */
PTS = (p[ 9] & 0x0E) << 29 ;