- updated to 2.8.3

- updated kvazaar patch
- added utvideo patch (fixes build with utvideo 15.3.x)

diff --git a/ffmpeg-kvazaar.patch b/ffmpeg-kvazaar.patch
index 374809d94c1a9324535e160b077ada3606f83300..999fc2cd912d0276ef7b9e02d4d42937e7d12f12 100644 (file)
--- a/ffmpeg-kvazaar.patch
+++ b/ffmpeg-kvazaar.patch
@@ -9,3 +9,14 @@
          av_log(avctx, AV_LOG_ERROR, "Failed to encode frame.\n");
          retval = AVERROR_EXTERNAL;
          goto done;
+--- ffmpeg-2.8.3/configure.orig        2015-11-27 14:41:22.000000000 +0100
++++ ffmpeg-2.8.3/configure     2015-11-29 21:24:42.660759291 +0100
+@@ -5240,7 +5240,7 @@
+                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
+                                done || die "ERROR: libgsm not found"; }
+ enabled libilbc           && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
+-enabled libkvazaar        && require_pkg_config "kvazaar < 0.7.0" kvazaar.h kvz_api_get
++enabled libkvazaar        && require_pkg_config "kvazaar >= 0.7.0" kvazaar.h kvz_api_get
+ enabled libmfx            && require_pkg_config libmfx "mfx/mfxvideo.h" MFXInit
+ enabled libmodplug        && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load
+ enabled libmp3lame        && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame

diff --git a/ffmpeg-utvideo.patch b/ffmpeg-utvideo.patch
new file mode 100644 (file)
index 0000000..f835c84
--- /dev/null
+++ b/ffmpeg-utvideo.patch
@@ -0,0 +1,23 @@
+--- ffmpeg-2.8.3/libavcodec/libutvideodec.cpp.orig     2015-09-09 03:17:45.000000000 +0200
++++ ffmpeg-2.8.3/libavcodec/libutvideodec.cpp  2015-11-29 21:45:43.984039667 +0100
+@@ -150,7 +150,7 @@
+     pic->key_frame = 1;
+ 
+     /* Decode the frame */
+-    utv->codec->DecodeFrame(utv->buffer, avpkt->data, true);
++    utv->codec->DecodeFrame(utv->buffer, avpkt->data);
+ 
+     /* Set the output data depending on the colorspace */
+     switch (avctx->pix_fmt) {
+--- ffmpeg-2.8.3/libavcodec/libutvideoenc.cpp.orig     2015-11-27 14:41:23.000000000 +0100
++++ ffmpeg-2.8.3/libavcodec/libutvideoenc.cpp  2015-11-30 17:01:44.241128916 +0100
+@@ -122,8 +122,7 @@
+     /* Get extradata from encoder */
+     avctx->extradata_size = utv->codec->EncodeGetExtraDataSize();
+     utv->codec->EncodeGetExtraData(info, avctx->extradata_size, in_format,
+-                                   avctx->width, avctx->height,
+-                                   CBGROSSWIDTH_WINDOWS);
++                                   avctx->width, avctx->height);
+     avctx->extradata = (uint8_t *)info;
+ 
+     /* Set flags */

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 172092db5fa1b07bc4cb9bd72a5b35f8c025c719..6295a135ca409586b5afb379890fc6be63707d42 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -62,20 +62,21 @@
 Summary:       FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):     FFmpeg - szybki konwerter audio/wideo
 Name:          ffmpeg
-Version:       2.8.1
-Release:       2
+Version:       2.8.3
+Release:       1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, x265, 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: 63b2cfeea930e942ff7579fd0064c5be
+Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
+# Source0-md5: 2af2723dd53364ac0635efd20cf6e34e
 Source1:       ffserver.init
 Source2:       ffserver.sysconfig
 Source3:       ffserver.conf
 Patch0:                %{name}-kvazaar.patch
 Patch1:                libvpx-1.5.patch
+Patch2:                %{name}-utvideo.patch
 URL:           http://www.ffmpeg.org/
 %{?with_decklink:BuildRequires:        Blackmagic_DeckLink_SDK}
 %{?with_openal:BuildRequires:  OpenAL-devel >= 1.1}
@@ -162,7 +163,7 @@ BuildRequires:      speex-devel >= 1:1.2-rc1
 %{?with_doc:BuildRequires:     texi2html}
 %{?with_doc:BuildRequires:     texinfo}
 BuildRequires: twolame-devel
-%{?with_utvideo:BuildRequires: utvideo-devel >= 12}
+%{?with_utvideo:BuildRequires: utvideo-devel >= 15.3}
 %{?with_vidstab:BuildRequires: vid.stab-devel >= 0.98}
 BuildRequires: vo-aacenc-devel
 BuildRequires: vo-amrwbenc-devel
@@ -181,7 +182,7 @@ BuildRequires:      zlib-devel
 # overflows maximum hash table size
 BuildConflicts:        pdksh < 5.2.14-57
 Requires:      %{name}-libs = %{version}-%{release}
-%{?with_utvideo:Requires:      utvideo >= 12}
+%{?with_utvideo:Requires:      utvideo >= 15.3}
 %{?with_ilbc:Requires: webrtc-libilbc}
 Requires:      xvid >= 1:1.1.0
 Obsoletes:     libpostproc
@@ -294,7 +295,7 @@ Requires:   schroedinger-devel
 %{?with_soxr:Requires: soxr-devel}
 Requires:      speex-devel >= 1:1.2-rc1
 Requires:      twolame-devel
-%{?with_utvideo:Requires:      utvideo-devel >= 12}
+%{?with_utvideo:Requires:      utvideo-devel >= 15.3}
 %{?with_vidstab:Requires:      vid.stab-devel >= 0.98}
 Requires:      vo-aacenc-devel
 Requires:      vo-amrwbenc-devel
@@ -381,6 +382,7 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig