Revert "sync up 2.0alpha branch with obs"

This reverts commit 53f1a2fc9d7a0757754b5c2ff0043a308fd8f852.

diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c
index 8f2937f..a87a870 100755 (executable)
--- a/gst-libs/gst/codecparsers/gstvc1parser.c
+++ b/gst-libs/gst/codecparsers/gstvc1parser.c
@@ -1163,6 +1163,10 @@ parse_frame_header_advanced (GstBitReader * br, GstVC1FrameHdr * framehdr,
           READ_UINT8 (br, pic->ttfrm, 2);
         }
       }
+      else { // 8.3.6.2.1
+        pic->ttmbf = 1;
+        pic->ttfrm = 0;
+      }
 
       framehdr->transacfrm = get_unary (br, 0, 2);
       READ_UINT8 (br, framehdr->transdctab, 1);
@@ -1275,6 +1279,10 @@ parse_frame_header_advanced (GstBitReader * br, GstVC1FrameHdr * framehdr,
           READ_UINT8 (br, pic->ttfrm, 2);
         }
       }
+      else { // 8.3.6.2.1
+        pic->ttmbf = 1;
+        pic->ttfrm = 0;
+      }
 
       framehdr->transacfrm = get_unary (br, 0, 2);
       READ_UINT8 (br, framehdr->transdctab, 1);
@@ -1459,6 +1467,10 @@ parse_frame_header (GstBitReader * br, GstVC1FrameHdr * framehdr,
           GST_DEBUG ("ttfrm %u", pic->ttfrm);
         }
       }
+      else { // 8.3.6.2.1
+        pic->ttmbf = 1;
+        pic->ttfrm = 0;
+      }
 
       framehdr->transacfrm = get_unary (br, 0, 2);
       READ_UINT8 (br, framehdr->transdctab, 1);
@@ -1491,6 +1503,10 @@ parse_frame_header (GstBitReader * br, GstVC1FrameHdr * framehdr,
           READ_UINT8 (br, pic->ttfrm, 2);
         }
       }
+      else { // 8.3.6.2.1
+        pic->ttmbf = 1;
+        pic->ttfrm = 0;
+      }
 
       framehdr->transacfrm = get_unary (br, 0, 2);
       READ_UINT8 (br, framehdr->transdctab, 1);

diff --git a/packaging/gst-plugins-bad.changes b/packaging/gst-plugins-bad.changes
index 596397e..72c1cff 100644 (file)
--- a/packaging/gst-plugins-bad.changes
+++ b/packaging/gst-plugins-bad.changes
@@ -1,3 +1,9 @@
+* Wed Sep 19 2012 Halley Zhao<halley.zhao@intel.com> submit/trunk/20120815.070008@762b0a9
+- fix bug TIVI-154. fix vc1 parser issue of ttmbf when vstransform is not set.
+
+* Thu Sep 13 2012 Yan Yin <yan.yin@intel.com> submit/trunk/20120815.070008@762b0a9
+- move many .so to main package, fix bug TIVI-177.
+
 * Fri Jul 06 2012 Nashif, Anas <anas.nashif@intel.com> 8212a27
 - Merge changes If11eceb4,I4067f381,I9ffe5baa
 

diff --git a/packaging/gst-plugins-bad.spec b/packaging/gst-plugins-bad.spec
index 6c97e96..2464655 100644 (file)
--- a/packaging/gst-plugins-bad.spec
+++ b/packaging/gst-plugins-bad.spec
@@ -42,8 +42,7 @@ Development files for the GStreamer media framework badplug-ins
 
 %build
 cp %{SOURCE1001} .
-./autogen.sh 
-%configure  --disable-static \
+%autogen --disable-static \
        --disable-nls \
        --with-html-dir=/tmp/dump \
        --disable-examples \
@@ -174,11 +173,11 @@ rm -rf %{buildroot}/tmp/*
 %manifest gst-plugins-bad.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libgst*.so.*
+%{_libdir}/gstreamer-0.10/libgst*.so
 
 %files devel
 %manifest gst-plugins-bad.manifest
 %defattr(-,root,root,-)
-%{_libdir}/gstreamer-0.10/libgst*.so
 %{_libdir}/libgst*.so
 %{_includedir}/gstreamer-0.10/gst/*
 %{_libdir}/pkgconfig/gstreamer-*.pc