diff --git a/mjpegtools-1.9.0-png-memleak.patch b/mjpegtools-1.9.0-png-memleak.patch new file mode 100644 index 0000000..f077a1a --- /dev/null +++ b/mjpegtools-1.9.0-png-memleak.patch @@ -0,0 +1,11 @@ +diff -up mjpegtools-1.9.0/lavtools/png2yuv.c~ mjpegtools-1.9.0/lavtools/png2yuv.c +--- mjpegtools-1.9.0/lavtools/png2yuv.c~ 2007-11-08 18:31:50.000000000 +0100 ++++ mjpegtools-1.9.0/lavtools/png2yuv.c 2010-09-03 13:32:43.015596001 +0200 +@@ -407,6 +407,7 @@ int decode_png(const char *pngname, int + return 2; + } + ++ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + fclose(pngfile); + + return 1; diff --git a/mjpegtools.spec b/mjpegtools.spec index 99eb24c..03d4616 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 1.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia @@ -9,6 +9,7 @@ URL: http://mjpeg.sourceforge.net/ Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz Patch0: %{name}-1.9.0rc1-anytovcd-ffmpegver.patch Patch1: mjpegtools-1.9.0-gcc44.patch +Patch2: mjpegtools-1.9.0-png-memleak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel @@ -74,6 +75,7 @@ for building applications that use mjpegtools libraries. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths for f in docs/yuvfps.1 ; do @@ -150,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 3 2010 Hans de Goede 1.9.0-2 +- Fix a memleak which is causing issues for LiVES + * Wed Apr 15 2009 Hans de Goede 1.9.0-1 - Update to upstream 1.9.0 final release