[pitivi] Patch for unknown stream types.

Jon Ciesla limb at fedoraproject.org
Tue Mar 27 16:56:04 UTC 2012


commit 5120804a64ef353e03ed86210e99b6c18e4d2b3d
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Mar 27 11:55:53 2012 -0500

    Patch for unknown stream types.

 pitivi-0.15.0-ignore-unknown-stream-types.patch |   29 +++++++++++++++++++++++
 pitivi.spec                                     |    8 +++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/pitivi-0.15.0-ignore-unknown-stream-types.patch b/pitivi-0.15.0-ignore-unknown-stream-types.patch
new file mode 100644
index 0000000..ff2c7ee
--- /dev/null
+++ b/pitivi-0.15.0-ignore-unknown-stream-types.patch
@@ -0,0 +1,29 @@
+diff -rup pitivi/effects.py pitivi/effects.py
+--- pitivi/effects.py	2011-09-24 11:16:29.000000000 -0400
++++ pitivi/effects.py	2011-11-18 11:09:21.475474154 -0500
+@@ -187,9 +187,13 @@ class EffectsHandler(object):
+ 
+             if padTmp.direction == gst.PAD_SRC:
+                 stream = get_stream_for_pad(pad)
++                if stream is None:
++                    continue
+                 factory.addInputStream(stream)
+             elif padTmp.direction == gst.PAD_SINK:
+                 stream = get_stream_for_pad(pad)
++                if stream is None:
++                    continue
+                 factory.addOutputStream(stream)
+         return True
+ 
+diff -rup pitivi/stream.py pitivi/stream.py
+--- pitivi/stream.py	2011-09-24 11:16:29.000000000 -0400
++++ pitivi/stream.py	2011-11-18 11:09:43.524670882 -0500
+@@ -370,6 +370,8 @@ def get_stream_for_pad(pad, store_pad=Fa
+         caps = pad.get_caps()
+     pad_id = get_pad_id(pad)
+     stream = get_stream_for_caps(caps, pad)
++    if stream is None:
++        return None
+     stream.pad_id = pad_id
+     if store_pad:
+         stream.pad = pad
diff --git a/pitivi.spec b/pitivi.spec
index c01dd6c..f2ee849 100644
--- a/pitivi.spec
+++ b/pitivi.spec
@@ -3,12 +3,13 @@
 
 Name:		pitivi
 Version:	%{major}.%{minor}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Non-linear video editor
 Group:		Applications/Multimedia
 License:	LGPLv2+
 URL:		http://www.pitivi.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/pitivi/%{major}/pitivi-%{version}.tar.bz2
+Patch0:		pitivi-0.15.0-ignore-unknown-stream-types.patch
 BuildRequires:	intltool >= 0.35.0
 BuildRequires:	python
 BuildRequires:	desktop-file-utils
@@ -41,6 +42,8 @@ program.
 %prep
 %setup -q
 
+%patch0 -p0 -b .unknown_types
+
 %build
 %configure --libdir=%{_datadir}
 
@@ -81,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/gnome/help/%{name}
 
 %changelog
+* Tue Mar 27 2012 Jon Ciesla <limburgher at gmail.com> - 0.15.0-3
+- Patch for unknown stream types, BZ 723653.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list