Author: arekm Date: Sat Mar 17 17:58:34 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 0.10.1
---- Files affected: packages/ffmpeg: ffmpeg.spec (1.246 -> 1.247) , ffmpeg-dup.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/ffmpeg/ffmpeg.spec diff -u packages/ffmpeg/ffmpeg.spec:1.246 packages/ffmpeg/ffmpeg.spec:1.247 --- packages/ffmpeg/ffmpeg.spec:1.246 Sun Mar 11 15:16:39 2012 +++ packages/ffmpeg/ffmpeg.spec Sat Mar 17 18:58:29 2012 @@ -26,20 +26,21 @@ Summary: FFmpeg - a very fast video and audio converter Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo Name: ffmpeg -Version: 0.10 -Release: 5 +Version: 0.10.1 +Release: 1 # LGPL or GPL, chosen at configure time (GPL version is more featured) # (postprocessing, some filters, x264, xavs, xvid, x11grab) # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc) License: GPL v3+ with LGPL v3+ parts Group: Applications/Multimedia Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: dc665cc599a739e3c5262ccdac13d129 +# Source0-md5: f391d3579b4a2dad8deb9989b7536268 Source1: ffserver.init Source2: ffserver.sysconfig Source3: ffserver.conf Patch0: %{name}-bug-803.patch Patch1: %{name}-gsm.patch +Patch2: %{name}-dup.patch URL: http://www.ffmpeg.org/ %{?with_openal:BuildRequires: OpenAL-devel} BuildRequires: SDL-devel @@ -250,6 +251,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # package the grep result for mplayer, the result formatted as ./mplayer/configure cat <<EOF > ffmpeg-avconfig @@ -534,6 +536,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.247 2012/03/17 17:58:29 arekm +- up to 0.10.1 + Revision 1.246 2012/03/11 14:16:39 arekm - release 5 ================================================================ Index: packages/ffmpeg/ffmpeg-dup.patch diff -u /dev/null packages/ffmpeg/ffmpeg-dup.patch:1.1 --- /dev/null Sat Mar 17 18:58:34 2012 +++ packages/ffmpeg/ffmpeg-dup.patch Sat Mar 17 18:58:29 2012 @@ -0,0 +1,10 @@ +--- ffmpeg-0.10.1/libavcodec/libx264.c~ 2012-03-17 01:45:47.000000000 +0100 ++++ ffmpeg-0.10.1/libavcodec/libx264.c 2012-03-17 18:54:52.643475029 +0100 +@@ -70,7 +70,6 @@ + char *partitions; + int direct_pred; + int slice_max_size; +- char *stats; + } X264Context; + + static void X264_log(void *p, int level, const char *fmt, va_list args) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.246&r2=1.247&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
