rpms/gstreamer-plugins-good/devel gst-plugins-good-0.10.7-qtdemux-unbreak.patch, NONE, 1.1 gstreamer-plugins-good.spec, 1.52, 1.53
Bastien Nocera (hadess)
fedora-extras-commits at redhat.com
Thu Apr 10 17:07:20 UTC 2008
Author: hadess
Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15433
Modified Files:
gstreamer-plugins-good.spec
Added Files:
gst-plugins-good-0.10.7-qtdemux-unbreak.patch
Log Message:
* Thu Apr 10 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.7-2
- Add patch to unbreak the QuickTime demuxer plugin
gst-plugins-good-0.10.7-qtdemux-unbreak.patch:
--- NEW FILE gst-plugins-good-0.10.7-qtdemux-unbreak.patch ---
--- qtdemux.c 2007/11/24 14:55:04 1.209
+++ qtdemux.c 2008/03/25 16:44:20 1.211
@@ -699,7 +699,7 @@
QtDemuxStream *stream = qtdemux->streams[n];
stream->time_position = desired_offset;
- stream->sample_index = 0;
+ stream->sample_index = -1;
stream->segment_index = -1;
stream->last_ret = GST_FLOW_OK;
}
@@ -1267,8 +1267,10 @@
}
/* we're at the right spot */
- if (index == stream->sample_index)
+ if (index == stream->sample_index) {
+ GST_DEBUG_OBJECT (qtdemux, "we are at the right index");
return TRUE;
+ }
/* find keyframe of the target index */
kf_index = gst_qtdemux_find_keyframe (qtdemux, stream, index);
@@ -1342,6 +1344,7 @@
GstBuffer *buffer = (GstBuffer *) stream->buffers->data;
if (stream->discont) {
+ GST_LOG_OBJECT (qtdemux, "marking discont buffer");
GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT);
stream->discont = FALSE;
}
@@ -1700,6 +1703,7 @@
goto next;
if (stream->discont) {
+ GST_LOG_OBJECT (qtdemux, "marking discont buffer");
GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DISCONT);
stream->discont = FALSE;
}
@@ -1862,6 +1866,9 @@
for (i = 0; i < demux->n_streams; i++) {
stream = demux->streams[i];
+ if (stream->sample_index == -1)
+ stream->sample_index = 0;
+
GST_LOG_OBJECT (demux,
"Checking Stream %d (sample_index:%d / offset:%lld / size:%d / chunk:%d)",
i, stream->sample_index, stream->samples[stream->sample_index].offset,
@@ -3112,7 +3119,7 @@
stream->need_clip = FALSE;
stream->segment_index = -1;
stream->time_position = 0;
- stream->sample_index = 0;
+ stream->sample_index = -1;
stream->last_ret = GST_FLOW_OK;
if (!(tkhd = qtdemux_tree_get_child_by_type (trak, FOURCC_tkhd)))
Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gstreamer-plugins-good.spec 21 Feb 2008 10:27:23 -0000 1.52
+++ gstreamer-plugins-good.spec 10 Apr 2008 17:06:15 -0000 1.53
@@ -6,7 +6,7 @@
Name: %{gstreamer}-plugins-good
Version: 0.10.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GStreamer plug-ins with good code and licensing
Group: Applications/Multimedia
@@ -14,6 +14,7 @@
URL: http://gstreamer.freedesktop.org/
Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.bz2
Patch0: gst-plugins-good-0.10.4-docs.patch
+Patch1: gst-plugins-good-0.10.7-qtdemux-unbreak.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{gstreamer} >= %{_gst}
@@ -94,6 +95,9 @@
%prep
%setup -q -n gst-plugins-good-%{version}
%patch0 -p1 -b .docs
+pushd gst/qtdemux/
+%patch1 -p0 -b .unbreak
+popd
%build
@@ -233,6 +237,9 @@
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
%changelog
+* Thu Apr 10 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.7-2
+- Add patch to unbreak the QuickTime demuxer plugin
+
* Thu Feb 21 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.7-1
- Update to 0.10.7
More information about the scm-commits
mailing list