Hello community, here is the log from the commit of package ffmpeg for openSUSE:Factory checked in at 2018-04-17 11:11:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg (Old) and /work/SRC/openSUSE:Factory/.ffmpeg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg" Tue Apr 17 11:11:12 2018 rev:42 rq:595283 version:3.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg.changes 2018-03-28 10:27:33.261303337 +0200 +++ /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg.changes 2018-04-17 11:11:12.500163788 +0200 @@ -1,0 +2,13 @@ +Mon Apr 09 20:47:49 UTC 2018 - [email protected] + +- Enable build against libzimg. + +------------------------------------------------------------------- +Tue Mar 27 16:04:57 UTC 2018 - [email protected] + +- Add 0001-opusenc-psy-disable-stereo-searches.patch + to fix a crash in the Opus encoder when outputting mono. +- Enable FFmpeg Opus encoder as a selectable runtime alternative + to Xiph libopus. + +------------------------------------------------------------------- New: ---- 0001-opusenc-psy-disable-stereo-searches.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg.spec ++++++ --- /var/tmp/diff_new_pack.U12IdA/_old 2018-04-17 11:11:13.528115565 +0200 +++ /var/tmp/diff_new_pack.U12IdA/_new 2018-04-17 11:11:13.532115376 +0200 @@ -53,6 +53,7 @@ Patch3: ffmpeg-new-coder-errors.diff Patch4: ffmpeg-codec-choice.diff Patch5: cve-2017-17555.diff +Patch6: 0001-opusenc-psy-disable-stereo-searches.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel @@ -98,6 +99,7 @@ BuildRequires: pkgconfig(xcb-xfixes) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(zimg) BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zvbi-0.2) %if 0%{?BUILD_ORIG} @@ -414,7 +416,7 @@ %prep %setup -q -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1 %build perl -i -pe 's{__TIME__|__DATE__}{"$&"}g' *.c @@ -457,6 +459,7 @@ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ + --enable-libzimg \ --enable-libzvbi \ --enable-vaapi \ --enable-vdpau \ ++++++ 0001-opusenc-psy-disable-stereo-searches.patch ++++++ >From f141b353e60f1081185927a1e74a9ab46cae8bef Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov <[email protected]> Date: Thu, 4 Jan 2018 02:52:40 +0000 Subject: [PATCH] opusenc_psy: disable stereo searches for mono streams Fixes a crash which happened when someone tried to encode mono. Signed-off-by: Rostislav Pehlivanov <[email protected]> --- libavcodec/opusenc_psy.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/opusenc_psy.c b/libavcodec/opusenc_psy.c index 50890c65d6..b712603344 100644 --- a/libavcodec/opusenc_psy.c +++ b/libavcodec/opusenc_psy.c @@ -383,6 +383,10 @@ static void celt_search_for_dual_stereo(OpusPsyContext *s, CeltFrame *f) { float td1, td2; f->dual_stereo = 0; + + if (s->avctx->channels < 2) + return; + bands_dist(s, f, &td1); f->dual_stereo = 1; bands_dist(s, f, &td2); @@ -396,6 +400,9 @@ static void celt_search_for_intensity(OpusPsyContext *s, CeltFrame *f) int i, best_band = CELT_MAX_BANDS - 1; float dist, best_dist = FLT_MAX; + if (s->avctx->channels < 2) + return; + /* TODO: fix, make some heuristic up here using the lambda value */ float end_band = 0; -- 2.11.0 ++++++ enable_encoders ++++++ --- /var/tmp/diff_new_pack.U12IdA/_old 2018-04-17 11:11:13.604111999 +0200 +++ /var/tmp/diff_new_pack.U12IdA/_new 2018-04-17 11:11:13.604111999 +0200 @@ -24,6 +24,7 @@ mjpeg # mjpegtools mp2 # twolame mp2fixed # twolame +opus pam pbm pcm_alaw
