- updated to 1.2

- removed obsolete gsm patch

diff --git a/ffmpeg-gsm.patch b/ffmpeg-gsm.patch
deleted file mode 100644 (file)
index ca85652..0000000
--- a/ffmpeg-gsm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ffmpeg-1.0/configure.orig  2012-10-05 22:11:11.888434415 +0200
-+++ ffmpeg-1.0/configure       2012-10-05 22:12:56.018432244 +0200
-@@ -3646,7 +3646,7 @@
- flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
- enabled libflite   && require2 libflite "flite/flite.h" flite_init $flite_libs
- enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
--enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
-+enabled libgsm     && require  libgsm gsm.h gsm_create -lgsm
- enabled libilbc    && require  libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
- enabled libmodplug && require  libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug
- enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
---- ffmpeg-0.10/libavcodec/libgsm.c.orig       2012-01-26 23:15:59.000000000 +0100
-+++ ffmpeg-0.10/libavcodec/libgsm.c    2012-01-27 17:58:28.495275196 +0100
-@@ -27,7 +27,7 @@
- 
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
- 
--#include <gsm/gsm.h>
-+#include <gsm.h>
- 
- #include "avcodec.h"
- #include "gsm.h"

diff --git a/ffmpeg.spec b/ffmpeg.spec
index e3ad7b859869093e63468d8a3025a2c870ece27f..ffca891574cb8a94cd3cdc6c6903e65c06cfac74 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.3
+Version:       1.2
 Release:       1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, xavs, xvid, x11grab)
@@ -34,13 +34,12 @@ Release:    1
 License:       GPL v3+ with LGPL v3+ parts
 Group:         Applications/Multimedia
 Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: f66eee18559ba59da63b895164a189c3
+# Source0-md5: c871d20559cb64c015b5cf0858812a56
 Source1:       ffserver.init
 Source2:       ffserver.sysconfig
 Source3:       ffserver.conf
-Patch0:                %{name}-gsm.patch
-Patch1:                %{name}-opencv24.patch
-Patch2:                %{name}-utvideo.patch
+Patch0:                %{name}-opencv24.patch
+Patch1:                %{name}-utvideo.patch
 URL:           http://www.ffmpeg.org/
 %{?with_openal:BuildRequires:  OpenAL-devel >= 1.1}
 BuildRequires: SDL-devel >= 1.2.1
@@ -281,7 +280,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