[PATCH] dvdstyler: fix compilation with current FFmpeg (was Re: multimedia stack update)

[Dominik 'Rathann' Mierzejewski]

Hi,
it seems I'm not in the ACLs for dvdstyler. Stewart, will you please commit
the attached patches?

Regards,
Dominik

-- 
Fedora http://fedoraproject.org/wiki/User:Rathann
RPMFusion http://rpmfusion.org | MPlayer http://mplayerhq.hu
"Faith manages."
        -- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"
-------------- next part --------------
diff -up DVDStyler-1.8.3/src/mediatrc_ffmpeg.cpp.ffmpeg DVDStyler-1.8.3/src/mediatrc_ffmpeg.cpp
--- DVDStyler-1.8.3/src/mediatrc_ffmpeg.cpp.ffmpeg	2011-03-10 21:08:22.000000000 +0100
+++ DVDStyler-1.8.3/src/mediatrc_ffmpeg.cpp	2011-08-14 11:01:29.000000000 +0200
@@ -2567,7 +2567,7 @@ bool wxFfmpegMediaTranscoder::DoVideoOut
 			} else
 				big_picture.quality = (int) ost->st->quality;
 			if (!me_threshold)
-				big_picture.pict_type = 0;
+				big_picture.pict_type = AV_PICTURE_TYPE_NONE;
 //			big_picture.pts = AV_NOPTS_VALUE;
 			big_picture.pts= ost->sync_opts;
 //			big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den);
-------------- next part --------------
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-14/dvdstyler.spec,v
retrieving revision 1.13
diff -u -r1.13 dvdstyler.spec
--- dvdstyler.spec	2 May 2011 07:20:02 -0000	1.13
+++ dvdstyler.spec	14 Aug 2011 11:46:22 -0000
@@ -1,7 +1,7 @@
 Name:           dvdstyler
 Epoch:          1
 Version:        1.8.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform DVD authoring application
 
 Group:          Applications/Multimedia
@@ -10,6 +10,7 @@
 Source0:        http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
 Patch0:         dvdstyler-make-desktopfile-valid.patch
 Patch1:         dvdstyler-wxVillaLib-libjpeg.patch
+Patch2:         dvdstyler-ffmpeg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # build
 BuildRequires:  automake, autoconf
@@ -54,6 +55,7 @@
 %setup -q -n DVDStyler-%{version}
 %patch0 -b .validdesktop
 %patch1 -b .libjpeg
+%patch2 -p1 -b .ffmpeg
 %{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
 
 %build
@@ -93,6 +95,9 @@
 %{_mandir}/*/*.gz
 
 %changelog
+* Sun Aug 14 2011 Dominik Mierzejewski <rpm at greysector.net> - 1:1.8.3-2
+- Fix build with current FFmpeg
+
 * Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> - 1:1.8.3-1
 - Update to 1.8.3