rpms/gstreamer-ffmpeg/F-8 gst-ffmpeg-0.10.3-vc1.patch, NONE,
1.1 gst-ffmpeg-0.10.1-syslibs.patch, 1.1,
1.2 gstreamer-ffmpeg.spec, 1.1, 1.2 foobar, 1.2, NONE
Hans de Goede
jwrdegoede at rpmfusion.org
Thu Jul 24 11:17:33 CEST 2008
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-ffmpeg/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29207
Modified Files:
gst-ffmpeg-0.10.1-syslibs.patch gstreamer-ffmpeg.spec
Added Files:
gst-ffmpeg-0.10.3-vc1.patch
Removed Files:
foobar
Log Message:
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.3-6
- Release bump for rpmfusion build
gst-ffmpeg-0.10.3-vc1.patch:
--- NEW FILE gst-ffmpeg-0.10.3-vc1.patch ---
diff -up gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegdec.c.vc1 gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegdec.c
--- gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegdec.c.vc1 2008-05-08 08:35:55.000000000 +0200
+++ gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegdec.c 2008-05-08 08:37:23.000000000 +0200
@@ -584,6 +584,11 @@ gst_ffmpegdec_setcaps (GstPad * pad, Gst
GST_OBJECT_LOCK (ffmpegdec);
+ /* stupid check for VC1 */
+ if ((oclass->in_plugin->id == CODEC_ID_WMV3) ||
+ (oclass->in_plugin->id == CODEC_ID_VC1))
+ oclass->in_plugin->id = gst_ffmpeg_caps_to_codecid (caps, NULL);
+
/* close old session */
gst_ffmpegdec_close (ffmpegdec);
gst-ffmpeg-0.10.1-syslibs.patch:
Index: gst-ffmpeg-0.10.1-syslibs.patch
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-8/gst-ffmpeg-0.10.1-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gst-ffmpeg-0.10.1-syslibs.patch 23 Apr 2008 15:16:52 -0000 1.1
+++ gst-ffmpeg-0.10.1-syslibs.patch 24 Jul 2008 09:17:32 -0000 1.2
@@ -28,19 +28,6 @@
case CODEC_ID_MPEG4AAC:
name = "MPEG-2/4 AAC audio";
break;
-@@ -3162,6 +3162,7 @@ gst_ffmpeg_avpicture_fill (AVPicture * p
- return 0;
- }
-
-+#if 0
- /**
- * Convert image 'src' to 'dst'.
- *
-@@ -3196,3 +3197,4 @@ gst_ffmpeg_img_convert (AVPicture * dst,
- return img_convert (dst, dst_pix_fmt, src, src_pix_fmt, src_width,
- src_height);
- }
-+#endif
--- gst-ffmpeg-0.10.2/ext/ffmpeg/gstffmpegcfg.c~ 2007-10-10 15:16:29.000000000 +0200
+++ gst-ffmpeg-0.10.2/ext/ffmpeg/gstffmpegcfg.c 2007-10-10 15:16:29.000000000 +0200
@@ -242,6 +242,7 @@ gst_ffmpeg_pred_method_get_type (void)
@@ -61,113 +48,3 @@
GST_LOG_OBJECT (ffmpegdec, "Opened ffmpeg codec %s, id %d",
oclass->in_plugin->name, oclass->in_plugin->id);
-@@ -1267,11 +1267,7 @@ get_output_buffer (GstFFMpegDec * ffmpeg
- gst_ffmpeg_avpicture_fill (&pic, GST_BUFFER_DATA (*outbuf),
- ffmpegdec->context->pix_fmt, width, height);
-
-- /* the original convert function did not do the right thing, this
-- * is a patched up version that adjust widht/height so that the
-- * ffmpeg one works correctly. */
-- gst_ffmpeg_img_convert (&pic, ffmpegdec->context->pix_fmt,
-- (AVPicture *) ffmpegdec->picture,
-+ av_picture_copy(&pic, (AVPicture *) ffmpegdec->picture,
- ffmpegdec->context->pix_fmt, width, height);
- }
- return ret;
-diff -up gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.in~ gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.in
---- gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.in~ 2008-02-10 22:00:45.000000000 +0100
-+++ gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.in 2008-02-10 22:00:45.000000000 +0100
-@@ -78,7 +78,7 @@ am_libgstffmpeg_la_OBJECTS = libgstffmpe
- libgstffmpeg_la-gstffmpegdemux.lo \
- libgstffmpeg_la-gstffmpegmux.lo \
- libgstffmpeg_la-gstffmpegdeinterlace.lo \
-- libgstffmpeg_la-gstffmpegscale.lo
-+
- libgstffmpeg_la_OBJECTS = $(am_libgstffmpeg_la_OBJECTS)
- libgstffmpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstffmpeg_la_CFLAGS) \
-@@ -271,7 +271,6 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
- gstffmpegdemux.c \
- gstffmpegmux.c \
- gstffmpegdeinterlace.c \
-- gstffmpegscale.c
-
- libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
- $(FFMPEG_CFLAGS)
-@@ -363,7 +362,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgstffmpeg_la-gstffmpegenc.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgstffmpeg_la-gstffmpegmux.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgstffmpeg_la-gstffmpegprotocol.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgstffmpeg_la-gstffmpegscale.Plo at am__quote@
-
- .c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -449,13 +447,6 @@ libgstffmpeg_la-gstffmpegdeinterlace.lo:
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstffmpeg_la_CFLAGS) $(CFLAGS) -c -o libgstffmpeg_la-gstffmpegdeinterlace.lo `test -f 'gstffmpegdeinterlace.c' || echo '$(srcdir)/'`gstffmpegdeinterlace.c
-
--libgstffmpeg_la-gstffmpegscale.lo: gstffmpegscale.c
-- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstffmpeg_la_CFLAGS) $(CFLAGS) -MT libgstffmpeg_la-gstffmpegscale.lo -MD -MP -MF $(DEPDIR)/libgstffmpeg_la-gstffmpegscale.Tpo -c -o libgstffmpeg_la-gstffmpegscale.lo `test -f 'gstffmpegscale.c' || echo '$(srcdir)/'`gstffmpegscale.c
-- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstffmpeg_la-gstffmpegscale.Tpo $(DEPDIR)/libgstffmpeg_la-gstffmpegscale.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstffmpegscale.c' object='libgstffmpeg_la-gstffmpegscale.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstffmpeg_la_CFLAGS) $(CFLAGS) -c -o libgstffmpeg_la-gstffmpegscale.lo `test -f 'gstffmpegscale.c' || echo '$(srcdir)/'`gstffmpegscale.c
--
- mostlyclean-libtool:
- -rm -f *.lo
-
-diff -up gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpeg.c~ gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpeg.c
---- gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpeg.c~ 2008-02-10 21:59:20.000000000 +0100
-+++ gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpeg.c 2008-02-10 21:59:20.000000000 +0100
-@@ -143,8 +143,8 @@ plugin_init (GstPlugin * plugin)
- gst_ffmpegdemux_register (plugin);
- gst_ffmpegmux_register (plugin);
- gst_ffmpegdeinterlace_register (plugin);
-- gst_ffmpegscale_register (plugin);
- #if 0
-+ gst_ffmpegscale_register (plugin);
- gst_ffmpegcsp_register (plugin);
- #endif
-
-diff -up gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.am~ gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.am
---- gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.am~ 2008-02-10 22:00:50.000000000 +0100
-+++ gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.am 2008-02-10 22:00:50.000000000 +0100
-@@ -9,7 +9,6 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
- gstffmpegdemux.c \
- gstffmpegmux.c \
- gstffmpegdeinterlace.c \
-- gstffmpegscale.c
-
- libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
- $(FFMPEG_CFLAGS)
---- gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegmux.c.syslibs 2006-10-25 19:20:25.000000000 +0200
-+++ gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegmux.c 2007-01-19 16:57:04.000000000 +0100
-@@ -481,7 +481,7 @@ gst_ffmpegmux_collected (GstCollectPads
- ffmpegmux->opened = TRUE;
-
- /* flush the header so it will be used as streamheader */
-- put_flush_packet (&ffmpegmux->context->pb);
-+ put_flush_packet (ffmpegmux->context->pb);
- }
-
- /* take the one with earliest timestamp,
-@@ -556,8 +556,8 @@ gst_ffmpegmux_collected (GstCollectPads
- /* close down */
- av_write_trailer (ffmpegmux->context);
- ffmpegmux->opened = FALSE;
-- put_flush_packet (&ffmpegmux->context->pb);
-- url_fclose (&ffmpegmux->context->pb);
-+ put_flush_packet (ffmpegmux->context->pb);
-+ url_fclose (ffmpegmux->context->pb);
- gst_pad_push_event (ffmpegmux->srcpad, gst_event_new_eos ());
- return GST_FLOW_UNEXPECTED;
- }
-@@ -598,7 +598,7 @@ gst_ffmpegmux_change_state (GstElement *
- }
- if (ffmpegmux->opened) {
- ffmpegmux->opened = FALSE;
-- url_fclose (&ffmpegmux->context->pb);
-+ url_fclose (ffmpegmux->context->pb);
- }
- break;
- case GST_STATE_CHANGE_READY_TO_NULL:
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-8/gstreamer-ffmpeg.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gstreamer-ffmpeg.spec 23 Apr 2008 15:16:52 -0000 1.1
+++ gstreamer-ffmpeg.spec 24 Jul 2008 09:17:32 -0000 1.2
@@ -1,6 +1,6 @@
Name: gstreamer-ffmpeg
Version: 0.10.3
-Release: 4%{?dist}
+Release: 6%{?dist}
Summary: GStreamer FFmpeg-based plug-ins
Group: Applications/Multimedia
# the ffmpeg plugin is LGPL, the postproc plugin is GPL
@@ -9,6 +9,7 @@
Source: http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-%{version}.tar.bz2
Patch0: gst-ffmpeg-0.10.1-syslibs.patch
Patch1: gst-ffmpeg-0.10.3-no-ffdec_faad.patch
+Patch2: gst-ffmpeg-0.10.3-vc1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gstreamer-devel >= 0.10.0
BuildRequires: gstreamer-plugins-base-devel >= 0.10.0
@@ -29,6 +30,7 @@
%setup -q -n gst-ffmpeg-%{version}
%patch0 -p1 -z .syslibs
%patch1 -p1
+%patch2 -p1
%build
@@ -57,6 +59,12 @@
%changelog
+* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.3-6
+- Release bump for rpmfusion build
+
+* Thu May 8 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.3-5
+- Fix playback of wvc1 videos (livna bug 1960)
+
* Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.3-4
- Disable ffdec_faad as this has issues (use gstreamer-plugins-bad instead)
(livna bug 1935)
--- foobar DELETED ---
More information about the rpmfusion-commits
mailing list