- up to 2.3.3

diff --git a/ffmpeg-opencv24.patch b/ffmpeg-opencv24.patch
index e7ddd316cd69f84aa95ec96b10aef625081a32d7..c4bc602291093cd00c94d0a0bf40a05ca6f7d1c3 100644 (file)
--- a/ffmpeg-opencv24.patch
+++ b/ffmpeg-opencv24.patch
@@ -1,11 +1,11 @@
---- ffmpeg-2.0/configure.orig  2013-07-14 11:29:51.533724995 +0200
-+++ ffmpeg-2.0/configure       2013-07-14 11:59:02.196984862 +0200
-@@ -4154,7 +4154,7 @@
+--- ffmpeg-2.3.3/configure~    2014-08-17 15:33:04.000000000 +0200
++++ ffmpeg-2.3.3/configure     2014-08-25 12:02:45.727180736 +0200
+@@ -4742,7 +4742,7 @@
  enabled libnut            && require libnut libnut.h nut_demuxer_init -lnut
  enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
  enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
 -enabled libopencv         && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
 +enabled libopencv         && add_extralibs -lopencv_core -lopencv_features2d -lopencv_imgproc -lopencv_objdetect -lgcrypt
- enabled libopenjpeg       && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg ||
-                                check_lib openjpeg.h opj_version -lopenjpeg ||
+ enabled libopenjpeg       && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
+                                check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
                                 die "ERROR: libopenjpeg not found"; }

diff --git a/ffmpeg.spec b/ffmpeg.spec
index e994f95871dfc0e6de4e146bcaf8bc2b34bbdba7..f14c3801cf939560b32e4610b6d2686291e3e312 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -46,7 +46,7 @@
 Summary:       FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):     FFmpeg - szybki konwerter audio/wideo
 Name:          ffmpeg
-Version:       2.2.7
+Version:       2.3.3
 Release:       1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, x265, xavs, xvid, x11grab)
@@ -54,7 +54,7 @@ Release:      1
 License:       GPL v3+ with LGPL v3+ parts
 Group:         Applications/Multimedia
 Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: f17f2821f3a1e15f15fadfbd8575fe34
+# Source0-md5: 72361d3b8717b6db3ad2b9da8df7af5e
 Source1:       ffserver.init
 Source2:       ffserver.sysconfig
 Source3:       ffserver.conf
@@ -108,8 +108,8 @@ BuildRequires:      libvorbis-devel
 %{?with_webp:BuildRequires:    libwebp-devel}
 # X264_BUILD >= 118
 %{?with_x264:BuildRequires:    libx264-devel >= 0.1.3-1.20111212_2245}
-# X265_BUILD >= 7
-%{?with_x265:BuildRequires:    libx265-devel >= 0.7}
+# X265_BUILD >= 17
+%{?with_x265:BuildRequires:    libx265-devel >= 1.3}
 %ifarch %{ix86}
 %ifnarch i386 i486
 BuildRequires: nasm
@@ -569,7 +569,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc CREDITS LICENSE MAINTAINERS README doc/{APIchanges,RELEASE_NOTES}
+%doc CREDITS LICENSE.md MAINTAINERS README.md RELEASE_NOTES doc/APIchanges
 %attr(755,root,root) %{_bindir}/ffmpeg
 %attr(755,root,root) %{_bindir}/ffprobe
 %attr(755,root,root) %{_bindir}/qt-faststart