rebase to upstream 1.2.4 release

Change-Id: I8f37e48b2002ae9b5828e9d048288267adbea819

diff --git a/packaging/common.tar.bz2 b/packaging/common.tar.bz2
index 8e991920d45779e6006c28763e9c6a634891ec2f..105c3ab3e3fc6c56405c233374e60a847bf5dd4f 100644 (file)
Binary files a/packaging/common.tar.bz2 and b/packaging/common.tar.bz2 differ

diff --git a/packaging/gst-plugins-bad.spec b/packaging/gst-plugins-bad.spec
index 61d4767b8fc55054649e69059d53357974138f58..3df75d1b22498ee4ad19669368e05b22f32a05ba 100644 (file)
--- a/packaging/gst-plugins-bad.spec
+++ b/packaging/gst-plugins-bad.spec
@@ -2,7 +2,7 @@
 %bcond_with x
 
 Name:           gst-plugins-bad
-Version:        1.2.0
+Version:        1.2.4
 Release:        0
 %define gst_branch 1.0
 Summary:        GStreamer Streaming-Media Framework Plug-Ins
@@ -324,3 +324,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gstreamer-plugins-bad-%{gst_branch}.pc
 %{_libdir}/pkgconfig/gstreamer-egl-%{gst_branch}.pc
 %{_libdir}/pkgconfig/gstreamer-insertbin-%{gst_branch}.pc
+%{_libdir}/pkgconfig/gstreamer-mpegts-%{gst_branch}.pc