mpegdemux: do not skip pes packets that we think are encrypted

pes packets that claim to be encrypted may not be so, so treat as normal.
Just log the flags.

diff --git a/gst/mpegdemux/gstpesfilter.c b/gst/mpegdemux/gstpesfilter.c
index 8a2ee2842a93617180489613a3bb4f4d6ab5f27e..efdb6cb5dc61ee41c2289d4c197a16925abe4d03 100644 (file)
--- a/gst/mpegdemux/gstpesfilter.c
+++ b/gst/mpegdemux/gstpesfilter.c
@@ -287,7 +287,7 @@ gst_pes_filter_parse (GstPESFilter * filter)
 
     /* check PES scrambling control */
     if ((flags & 0x30) != 0)
-      goto encrypted;
+      GST_DEBUG ("PES scrambling control: %x", (flags >> 4) & 0x3);
 
     /* 2: PTS_DTS_flags
      * 1: ESCR_flag
@@ -479,17 +479,6 @@ skip:
     gst_adapter_flush (filter->adapter, avail);
     ADAPTER_OFFSET_FLUSH (avail);
 
-    filter->length -= avail - 6;
-    if (filter->length > 0 || filter->unbounded_packet)
-      filter->state = STATE_DATA_SKIP;
-    return GST_FLOW_OK;
-  }
-encrypted:
-  {
-    GST_DEBUG ("skipping encrypted 0x%02x", filter->id);
-    gst_adapter_flush (filter->adapter, avail);
-    ADAPTER_OFFSET_FLUSH (avail);
-
     filter->length -= avail - 6;
     if (filter->length > 0 || filter->unbounded_packet)
       filter->state = STATE_DATA_SKIP;