- updated to 1.1.1

- removed obsolete cdio-paranoia patch

diff --git a/ffmpeg-cdio-paranoia.patch b/ffmpeg-cdio-paranoia.patch
deleted file mode 100644 (file)
index c0ffc0d..0000000
--- a/ffmpeg-cdio-paranoia.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ffmpeg-1.0.1/libavdevice/libcdio.c.orig    2012-12-03 22:17:35.000000000 +0100
-+++ ffmpeg-1.0.1/libavdevice/libcdio.c 2012-12-06 19:03:32.695282861 +0100
-@@ -23,8 +23,8 @@
-  * libcdio CD grabbing
-  */
- 
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- 
- #include "libavutil/log.h"
- #include "libavutil/mem.h"
---- ffmpeg-1.1/configure.orig  2013-01-12 20:17:28.423418802 +0100
-+++ ffmpeg-1.1/configure       2013-01-12 20:41:48.743388367 +0100
-@@ -3817,7 +3817,7 @@
- enabled libaacplus && require  "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus
- enabled libass     && require_pkg_config libass ass/ass.h ass_library_init
- enabled libbluray  && require libbluray libbluray/bluray.h bd_open -lbluray
--enabled libcdio    && require2 libcdio "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
-+enabled libcdio    && require2 libcdio "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
- enabled libcelt    && require libcelt celt/celt.h celt_decode -lcelt0 &&
-                       { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
-                         die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 7dc83413b6318a5c1e676adeb102c72509d293cd..78d5dc98dea00d8f3990d062a9bf308b8b72c7d0 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -26,7 +26,7 @@
 Summary:       FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):     FFmpeg - szybki konwerter audio/wideo
 Name:          ffmpeg
-Version:       1.1
+Version:       1.1.1
 Release:       1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, xavs, xvid, x11grab)
@@ -34,14 +34,13 @@ Release:    1
 License:       GPL v3+ with LGPL v3+ parts
 Group:         Applications/Multimedia
 Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 578c590a0e996c1fc71acb666c0ed858
+# Source0-md5: 8d6ece2641f54fe3a86f270426f83e52
 Source1:       ffserver.init
 Source2:       ffserver.sysconfig
 Source3:       ffserver.conf
 Patch0:                %{name}-gsm.patch
 Patch1:                %{name}-opencv24.patch
-Patch2:                %{name}-cdio-paranoia.patch
-Patch3:                %{name}-utvideo.patch
+Patch2:                %{name}-utvideo.patch
 URL:           http://www.ffmpeg.org/
 %{?with_openal:BuildRequires:  OpenAL-devel >= 1.1}
 BuildRequires: SDL-devel >= 1.2.1
@@ -283,7 +282,6 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig