aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-10-23 10:56:00 +0200
committerghost <andreas.monzner@multimedia-labs.de>2009-10-23 10:56:00 +0200
commitb42f30663cefa8e0eb53c76a59356a3608f57001 (patch)
tree36f6e329591a60790736ec65ae37f3f8462c552b
parentb8a294c0739965ca794303b3742ea7dceb126894 (diff)
downloadopenembedded-org.openembedded.dreambox.zip
openembedded-org.openembedded.dreambox.tar.gz
openembedded-org.openembedded.dreambox.tar.bz2
packages/gstreamer: update gst-plugins-ugly and gst-plugins-badorg.openembedded.dreambox
small fix for ac3 detection in mpegtsdemux
-rw-r--r--packages/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff22
-rw-r--r--packages/gstreamer/gst-plugins-bad_0.10.15.bb (renamed from packages/gstreamer/gst-plugins-bad_0.10.14.bb)4
-rw-r--r--packages/gstreamer/gst-plugins-ugly_0.10.13.bb (renamed from packages/gstreamer/gst-plugins-ugly_0.10.12.bb)1
3 files changed, 24 insertions, 3 deletions
diff --git a/packages/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff b/packages/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff
new file mode 100644
index 0000000..9483383
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-bad/mpegtsdemux_fix_ac3_detection.diff
@@ -0,0 +1,22 @@
+--- 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 @@
+ 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,
++ 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,
+- DESC_DVB_ENHANCED_AC3)) {
++ } else if (desc && DESC_REGISTRATION_format_identifier (desc) == DRF_ID_HDMV) {
+ template = klass->audio_template;
+ name = g_strdup_printf ("audio_%04x", stream->PID);
+- 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 "
diff --git a/packages/gstreamer/gst-plugins-bad_0.10.14.bb b/packages/gstreamer/gst-plugins-bad_0.10.15.bb
index 3a2e08c..78e7fcd 100644
--- a/packages/gstreamer/gst-plugins-bad_0.10.14.bb
+++ b/packages/gstreamer/gst-plugins-bad_0.10.15.bb
@@ -4,5 +4,5 @@ EXTRA_OECONF += "--disable-apexsink --disable-dvdnav"
RCONFLICTS_gst-plugin-mpegdemux = "gst-plugin-fluendo-mpegdemux"
RREPLACES_gst-plugin-mpegdemux = "gst-plugin-fluendo-mpegdemux"
SRC_URI += "file://gst-plugins_configure_skip_shave.patch;patch=1;pnum=0 \
- file://mpegpsdemux_speedup.diff;patch=1;pnum=0"
-PR = "r1"
+ file://mpegpsdemux_speedup.diff;patch=1;pnum=0 \
+ file://mpegtsdemux_fix_ac3_detection.diff;patch=1;pnum=0"
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.12.bb b/packages/gstreamer/gst-plugins-ugly_0.10.13.bb
index 7eaea9e..e4684a7 100644
--- a/packages/gstreamer/gst-plugins-ugly_0.10.12.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.13.bb
@@ -1,4 +1,3 @@
require gst-plugins.inc
SRC_URI += "file://gst-plugins_configure_skip_shave.patch;patch=1;pnum=0"
DEPENDS += "gst-plugins-base"
-PR="r5" \ No newline at end of file