- up to 0.10.2

Changed files:
    ffmpeg-dup.patch -> 1.2
    ffmpeg.spec -> 1.248

diff --git a/ffmpeg-dup.patch b/ffmpeg-dup.patch
deleted file mode 100644 (file)
index 89f29f3..0000000
--- a/ffmpeg-dup.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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)

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 72f0152a1d532f72681dbb2dd95843c4b615c184..808a891cb1ad385857ef90f5fad5d4e0e9a94ed6 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -25,7 +25,7 @@
 Summary:       FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):     FFmpeg - szybki konwerter audio/wideo
 Name:          ffmpeg
-Version:       0.10.1
+Version:       0.10.2
 Release:       1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, xavs, xvid, x11grab)
@@ -33,13 +33,12 @@ Release:    1
 License:       GPL v3+ with LGPL v3+ parts
 Group:         Applications/Multimedia
 Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: f391d3579b4a2dad8deb9989b7536268
+# Source0-md5: de1bd5fc4bbf3ef730a5361ee596fedd
 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,7 +249,6 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig