Author: rathann Update of /cvs/free/rpms/ffmpeg/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv10978 Modified Files: ffmpeg.spec Added Files: ffmpeg-av_parser_parse-fix.patch Log Message: * Tue Apr 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.90-0.2.rc0 - fixed missing av_parser_parse symbol (upstream patch) ffmpeg-av_parser_parse-fix.patch: parser.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE ffmpeg-av_parser_parse-fix.patch --- From: Brad <brad(a)comstyle.com&gt; Date: Wed, 6 Apr 2011 17:41:12 -0400 Subject: [PATCH] Fix parser: mark av_parser_parse() for removal on next major bump Fix the breakage introduced with 9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d --- libavcodec/parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 0c69b91..3ba3e9c 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -105,7 +105,7 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){ } } -#if LIBAVCODEC_VERSION_MINOR < 53 +#if LIBAVCODEC_VERSION_MAJOR < 53 /** * * @param buf input -- 1.7.2.5 Index: ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- ffmpeg.spec 4 Apr 2011 15:26:35 -0000 1.41 +++ ffmpeg.spec 12 Apr 2011 00:30:53 -0000 1.42 @@ -7,7 +7,7 @@ Summary: Digital VCR and streaming server Name: ffmpeg Version: 0.6.90 -Release: 0.1.%{rel}%{?dist} +Release: 0.2.%{rel}%{?dist} %if 0%{?_with_amr:1} License: GPLv3+ %else @@ -21,6 +21,8 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}-%{rel}.tar.bz2 %endif Source1: ffmpeg-snapshot.sh +# http://git.videolan.org/gitweb.cgi?p=ffmpeg.git;a=patch;h=1f6265e011f6e56... +Patch0: ffmpeg-av_parser_parse-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} BuildRequires: bzip2-devel @@ -123,6 +125,7 @@ %else %setup -q -n ffmpeg-%{version}-%{rel} %endif +%patch0 -p1 -b .av_parser_parse-fix %build mkdir generic @@ -238,6 +241,9 @@ %changelog +* Tue Apr 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.90-0.2.rc0 +- fixed missing av_parser_parse symbol (upstream patch) + * Mon Apr 04 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.90-0.1.rc0 - updated to 0.6.90-rc0 release - ensure main package is version-locked to the -libs subpackage