rpms/gstreamer-plugins-base/devel avf-support.patch, NONE, 1.1 gstreamer-plugins-base.spec, 1.86, 1.87

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5096

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	avf-support.patch 
Log Message:
* Wed Aug 26 2009 Adam Jackson <ajax at redhat.com> 0.10.24-2
- avf-support.patch: Add AVF file recognition (gnome #593117)


avf-support.patch:
 gst-libs/gst/riff/riff-ids.h        |    1 +
 gst-libs/gst/riff/riff-read.c       |    2 +-
 gst/typefind/gsttypefindfunctions.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE avf-support.patch ---
Ref: http://bugzilla.gnome.org/show_bug.cgi?id=593117

diff -up gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-ids.h.jx gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-ids.h
--- gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-ids.h.jx	2009-07-14 06:03:45.000000000 -0400
+++ gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-ids.h	2009-08-26 11:16:20.000000000 -0400
@@ -33,6 +33,7 @@ G_BEGIN_DECLS
 
 /* tags */
 #define GST_RIFF_TAG_RIFF GST_MAKE_FOURCC ('R','I','F','F')
+#define GST_RIFF_TAG_AVF0 GST_MAKE_FOURCC ('A','V','F','0')
 #define GST_RIFF_TAG_RIFX GST_MAKE_FOURCC ('R','I','F','X')
 #define GST_RIFF_TAG_LIST GST_MAKE_FOURCC ('L','I','S','T')
 #define GST_RIFF_TAG_avih GST_MAKE_FOURCC ('a','v','i','h')
diff -up gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-read.c.jx gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-read.c
--- gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-read.c.jx	2009-07-14 06:03:45.000000000 -0400
+++ gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-read.c	2009-08-26 11:16:54.000000000 -0400
@@ -226,7 +226,7 @@ gst_riff_parse_file_header (GstElement *
 
   data = GST_BUFFER_DATA (buf);
   tag = GST_READ_UINT32_LE (data);
-  if (tag != GST_RIFF_TAG_RIFF)
+  if (tag != GST_RIFF_TAG_RIFF && tag != GST_RIFF_TAG_AVF0)
     goto not_riff;
 
   *doctype = GST_READ_UINT32_LE (data + 8);
diff -up gst-plugins-base-0.10.24/gst/typefind/gsttypefindfunctions.c.jx gst-plugins-base-0.10.24/gst/typefind/gsttypefindfunctions.c
--- gst-plugins-base-0.10.24/gst/typefind/gsttypefindfunctions.c.jx	2009-08-04 18:26:58.000000000 -0400
+++ gst-plugins-base-0.10.24/gst/typefind/gsttypefindfunctions.c	2009-08-26 11:17:56.000000000 -0400
@@ -3147,7 +3147,7 @@ riff_type_find (GstTypeFind * tf, gpoint
   GstTypeFindData *riff_data = (GstTypeFindData *) private;
   guint8 *data = gst_type_find_peek (tf, 0, 12);
 
-  if (data && memcmp (data, "RIFF", 4) == 0) {
+  if (data && (memcmp (data, "RIFF", 4) == 0 || memcmp (data, "AVF0", 4) == 0)) {
     data += 8;
     if (memcmp (data, riff_data->data, 4) == 0)
       gst_type_find_suggest (tf, riff_data->probability, riff_data->caps);


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- gstreamer-plugins-base.spec	5 Aug 2009 12:46:15 -0000	1.86
+++ gstreamer-plugins-base.spec	26 Aug 2009 15:21:47 -0000	1.87
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.24
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -14,6 +14,8 @@ URL:		http://gstreamer.freedesktop.org/
 Source:		http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:		avf-support.patch
+
 Requires:       %{gstreamer} >= %{_gst}
 Requires:	liboil >= 0.3.12-9
 BuildRequires: 	%{gstreamer}-devel >= %{_gst}
@@ -51,6 +53,7 @@ This package contains a set of well-main
 
 %prep
 %setup -q -n gst-plugins-base-%{version}
+%patch0 -p1 -b .avf
 
 %build
 %configure \
@@ -245,6 +248,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Wed Aug 26 2009 Adam Jackson <ajax at redhat.com> 0.10.24-2
+- avf-support.patch: Add AVF file recognition (gnome #593117)
+
 * Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
 - Update to 0.10.24