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

[Stewart Adam]

On 2011/08/14 7:47 AM, Dominik 'Rathann' Mierzejewski wrote:
> Hi,
> it seems I'm not in the ACLs for dvdstyler. Stewart, will you please commit
> the attached patches?
>
> Regards,
> Dominik
>

I'm getting this error after committing the patches and building F-14:
mediatrc_ffmpeg.cpp:2570:29: error: 'AV_PICTURE_TYPE_NONE' was not declared 
in this scope

Context:
g++ -DPACKAGE_NAME=\"DVDStyler\" -DPACKAGE_TARNAME=\"dvdstyler\" 
-DPACKAGE_VERSION=\"1.8.3\" -DPACKAGE_STRING=\"DVDStyler\ 1.8.3\" 
-DPACKAGE_BUGREPORT=\"www.dvdstyler.org\" -DPACKAGE_URL=\"\" 
-DPACKAGE=\"dvdstyler\" -DVERSION=\"1.8.3\" -DSTDC_HEADERS=1 
-DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 
-DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 
-DHAVE_UNISTD_H=1 -I.   -I/usr/lib64/wx/include/gtk2-unicode-release-2.8 
-I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__  -O2 
-g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector 
--param=ssp-buffer-size=4 -m64 -mtune=generic  -fno-strict-aliasing 
-I/usr/lib64/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 
-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread  -DGNOME2 
-I/usr/include/ffmpeg       -DHAVE_LIBUDEV 
-DDATADIR=\"/usr/share/dvdstyler\" -I.. -O2 -g -pipe -Wall 
-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector
   --param=ssp-buffer-size=4 -m64 -mtune=generic  -fno-strict-aliasing 
-I/usr/lib64/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 
-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread  -DGNOME2 
-I/usr/include/ffmpeg       -DHAVE_LIBUDEV 
-DDATADIR=\"/usr/share/dvdstyler\" -c -o mediatrc_ffmpeg.o mediatrc_ffmpeg.cpp
mediatrc_ffmpeg.cpp: In member function 'bool 
wxFfmpegMediaTranscoder::DoVideoOut(AVFormatContext*, AVOutputStream*, 
AVInputStream*, AVFrame*, int*, int, uint8_t*)':
mediatrc_ffmpeg.cpp:2570:29: error: 'AV_PICTURE_TYPE_NONE' was not declared 
in this scope

Full logs: 
http://buildsys.rpmfusion.org/logs/fedora-14-rpmfusion_free/10052-dvdstyler-1.8.3-2.fc14/

Maybe the new x264 didn't hadn't hit the buildroots yet?

Regards,
Stewart