X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=recipes%2Fgstreamer%2Fgst-plugins-bad%2Fmpegtsdemux_fix_ac3_detection.diff;h=7945c724baf5b143e58c308c0c636dbe7d8ce652;hb=690c627eed5c381c13aa6e3d1c97288f47cba8b6;hp=94833838e6e39fa89d457770d26107e6fbef4bbb;hpb=320711b0100a4c5e73097f28b70f0a8702293572;p=vuplus_openembedded

diff --git a/recipes/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff b/recipes/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff
index 9483383..7945c72 100644
--- a/recipes/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff
+++ b/recipes/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff
@@ -1,16 +1,16 @@
---- gst/mpegdemux/gstmpegtsdemux.c	2009-10-12 12:23:39.000000000 +0200
-+++ gst/mpegdemux/gstmpegtsdemux.c	2009-10-22 23:08:42.000000000 +0200
-@@ -738,15 +738,15 @@
+--- gst/mpegdemux/gstmpegtsdemux.c	2010-09-02 23:30:31.000000000 +0200
++++ gst/mpegdemux/gstmpegtsdemux.c	2010-09-29 15:26:53.156823244 +0200
+@@ -737,15 +737,15 @@
        if (program_info)
          desc = gst_mpeg_descriptor_find (program_info, DESC_REGISTRATION);
  
 -      if (desc && DESC_REGISTRATION_format_identifier (desc) == DRF_ID_HDMV) {
-+      if (gst_mpeg_descriptor_find (stream->ES_info,
++      if (stream->ES_info && gst_mpeg_descriptor_find (stream->ES_info,
 +              DESC_DVB_ENHANCED_AC3)) {
          template = klass->audio_template;
          name = g_strdup_printf ("audio_%04x", stream->PID);
          caps = gst_caps_new_simple ("audio/x-eac3", NULL);
--      } else if (gst_mpeg_descriptor_find (stream->ES_info,
+-      } else if (stream->ES_info && gst_mpeg_descriptor_find (stream->ES_info,
 -              DESC_DVB_ENHANCED_AC3)) {
 +      } else if (desc && DESC_REGISTRATION_format_identifier (desc) == DRF_ID_HDMV) {
          template = klass->audio_template;
@@ -18,5 +18,5 @@
 -        caps = gst_caps_new_simple ("audio/x-eac3", NULL);
 +        caps = gst_caps_new_simple ("audio/x-ac3", NULL);
        } else {
-         if (!gst_mpeg_descriptor_find (stream->ES_info, DESC_DVB_AC3)) {
-           GST_WARNING ("AC3 stream type found but no corresponding "
+         if (!stream->ES_info ||
+             !gst_mpeg_descriptor_find (stream->ES_info, DESC_DVB_AC3)) {