Hello community, here is the log from the commit of package ffmpeg for openSUSE:Factory checked in at 2016-11-03 11:09:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg (Old) and /work/SRC/openSUSE:Factory/.ffmpeg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ffmpeg" Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg.changes 2016-10-28 10:41:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg.changes 2016-11-03 11:09:59.000000000 +0100 @@ -1,0 +2,30 @@ +Fri Oct 28 22:50:18 UTC 2016 - jengelh@inai.de + +- Update to new upstream release 3.2 +* SDL2 output device and ffplay support +* SDL1 output device and SDL1 support removed +* New: libopenmpt demuxer, fifo muxer, True Audio (TTA) muxer +* New filters: weave, gblur, avgblur, sobel, prewitt, + vaguedenoiser, yuvtestsrc, lut2, hysteresis, maskedclamp, + crystalizer, acrusher, bitplanenoise, sidedata, asidedata +* Non-Local Means (nlmeans) denoising filter +* 16-bit support in curves filter and selectivecolor filter +* Added threads option per filter instance +* The "curves" filter does not automatically insert points at x=0 + and x=1 anymore +* Matroska muxer now writes CRC32 elements by default in all + Level 1 elements +* New "tee" protocol +* VP8 in Ogg muxing +* Floating point support in ALS decoder +* Extended mov edit list support +* Changed mapping of RTP MIME type G726 to codec g726le. +- Drop ffmpeg-fix-CONFIG_VC1DSP-changes.patch + (no longer needed) + +------------------------------------------------------------------- +Fri Oct 28 17:58:28 UTC 2016 - olaf@aepfle.de + +- Enable libfdk_aac if it is available at buildtime + +------------------------------------------------------------------- Old: ---- ffmpeg-3.1.5.tar.xz ffmpeg-3.1.5.tar.xz.asc ffmpeg-fix-CONFIG_VC1DSP-changes.patch New: ---- ffmpeg-3.2.tar.xz ffmpeg-3.2.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg.spec ++++++ --- /var/tmp/diff_new_pack.7cSP1b/_old 2016-11-03 11:10:01.000000000 +0100 +++ /var/tmp/diff_new_pack.7cSP1b/_new 2016-11-03 11:10:01.000000000 +0100 @@ -16,6 +16,7 @@ # +%bcond_with fdk_aac %bcond_with lame %bcond_with librtmp %bcond_with twolame @@ -32,7 +33,7 @@ %bcond_without webp Name: ffmpeg -Version: 3.1.5 +Version: 3.2 Release: 0 Summary: Library for working with various multimedia formats License: LGPL-2.1+ and GPL-2.0+ @@ -54,7 +55,6 @@ Patch3: ffmpeg-pkgconfig-version.patch Patch4: ffmpeg-new-coder-errors.diff Patch5: ffmpeg-codec-choice.diff -Patch6: ffmpeg-fix-CONFIG_VC1DSP-changes.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: pkg-config @@ -95,7 +95,7 @@ BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(schroedinger-1.0) -BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(theora) >= 1.1 %if %{with vdpau} @@ -113,6 +113,9 @@ BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(zlib) %if 0%{?BUILD_ORIG} +%if %{with fdk_aac} +BuildRequires: pkgconfig(fdk-aac) +%endif %if %{with librtmp} BuildRequires: pkgconfig(librtmp) %endif @@ -359,7 +362,7 @@ %prep %setup -q -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 %build perl -i -pe 's{__TIME__|__DATE__}{"$&"}g' *.c @@ -412,6 +415,9 @@ --enable-vdpau \ %endif %if 0%{?BUILD_ORIG} +%if %{with fdk_aac} + --enable-libfdk_aac --enable-nonfree \ +%endif %if %{with lame} --enable-libmp3lame \ %endif ++++++ ffmpeg-3.1.5.tar.xz -> ffmpeg-3.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg-3.1.5.tar.xz /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg-3.2.tar.xz differ: char 26, line 1 ++++++ ffmpeg-new-coder-errors.diff ++++++ --- /var/tmp/diff_new_pack.7cSP1b/_old 2016-11-03 11:10:01.000000000 +0100 +++ /var/tmp/diff_new_pack.7cSP1b/_new 2016-11-03 11:10:01.000000000 +0100 @@ -5,15 +5,16 @@ (in light of openSUSE's reduced build). --- - ffmpeg.c | 4 ++-- + ffmpeg.c | 2 +- ffmpeg_filter.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) + ffmpeg_opt.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) -Index: ffmpeg-3.0.1/ffmpeg.c +Index: ffmpeg-3.2/ffmpeg.c =================================================================== ---- ffmpeg-3.0.1.orig/ffmpeg.c -+++ ffmpeg-3.0.1/ffmpeg.c -@@ -2525,7 +2525,7 @@ static int init_input_stream(int ist_ind +--- ffmpeg-3.2.orig/ffmpeg.c ++++ ffmpeg-3.2/ffmpeg.c +@@ -2698,7 +2698,7 @@ static int init_input_stream(int ist_ind if (ist->decoding_needed) { AVCodec *codec = ist->dec; if (!codec) { @@ -22,20 +23,11 @@ avcodec_get_name(ist->dec_ctx->codec_id), ist->file_index, ist->st->index); return AVERROR(EINVAL); } -@@ -3021,7 +3021,7 @@ static int transcode_init(void) - ost->enc = avcodec_find_encoder(enc_ctx->codec_id); - if (!ost->enc) { - /* should only happen when a default codec is not present. */ -- snprintf(error, sizeof(error), "Encoder (codec %s) not found for output stream #%d:%d", -+ snprintf(error, sizeof(error), "This build of ffmpeg does not include a \"%s\" encoder needed for output stream #%d:%d.", - avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index); - ret = AVERROR(EINVAL); - goto dump_format; -Index: ffmpeg-3.0.1/ffmpeg_filter.c +Index: ffmpeg-3.2/ffmpeg_filter.c =================================================================== ---- ffmpeg-3.0.1.orig/ffmpeg_filter.c -+++ ffmpeg-3.0.1/ffmpeg_filter.c -@@ -948,7 +948,7 @@ static int configure_input_filter(Filter +--- ffmpeg-3.2.orig/ffmpeg_filter.c ++++ ffmpeg-3.2/ffmpeg_filter.c +@@ -965,7 +965,7 @@ static int configure_input_filter(Filter if (!ifilter->ist->dec) { av_log(NULL, AV_LOG_ERROR, @@ -44,12 +36,25 @@ ifilter->ist->file_index, ifilter->ist->st->index); return AVERROR_DECODER_NOT_FOUND; } -@@ -1057,7 +1057,7 @@ int configure_filtergraph(FilterGraph *f +@@ -1080,7 +1080,7 @@ int configure_filtergraph(FilterGraph *f if (!ost->enc) { /* identical to the same check in ffmpeg.c, needed because complex filter graphs are initialized earlier */ - av_log(NULL, AV_LOG_ERROR, "Encoder (codec %s) not found for output stream #%d:%d\n", + av_log(NULL, AV_LOG_ERROR, "This build of ffmpeg_filter does not include a \"%s\" encoder needed for output stream #%d:%d.\n", - avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index); + avcodec_get_name(ost->st->codecpar->codec_id), ost->file_index, ost->index); return AVERROR(EINVAL); } +Index: ffmpeg-3.2/ffmpeg_opt.c +=================================================================== +--- ffmpeg-3.2.orig/ffmpeg_opt.c ++++ ffmpeg-3.2/ffmpeg_opt.c +@@ -1203,7 +1203,7 @@ static int choose_encoder(OptionsContext + if (!ost->enc) { + av_log(NULL, AV_LOG_FATAL, "Automatic encoder selection failed for " + "output stream #%d:%d. Default encoder for format %s (codec %s) is " +- "probably disabled. Please choose an encoder manually.\n", ++ "probably disabled or this build of ffmpeg does not include that codec. Please choose an encoder manually.\n", + ost->file_index, ost->index, s->oformat->name, + avcodec_get_name(ost->st->codecpar->codec_id)); + return AVERROR_ENCODER_NOT_FOUND;