Hello community, here is the log from the commit of package ffmpeg for openSUSE:Factory checked in at 2018-07-02 23:30:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg (Old) and /work/SRC/openSUSE:Factory/.ffmpeg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg" Mon Jul 2 23:30:56 2018 rev:44 rq:619911 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg.changes 2018-06-25 11:36:46.353945521 +0200 +++ /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg.changes 2018-07-02 23:31:08.581420914 +0200 @@ -1,0 +2,34 @@ +Fri Jun 29 22:03:53 UTC 2018 - 9+suse@cirno.systems + +- Enable ffnvcodec when building with NVIDIA support + +------------------------------------------------------------------- +Fri Jun 29 21:59:52 UTC 2018 - bjorn....@gmail.com + +- Add pkgconfig(srt) BuildRequires and pass --enable-libsrt to + configure, enable srt support. +- Refresh patches with quilt: + * cve-2017-17555.diff + * ffmpeg-codec-choice.diff + * ffmpeg-libcdio_cdda-pkgconfig.patch + * ffmpeg-new-coder-errors.diff + +------------------------------------------------------------------- +Fri Jun 29 00:07:18 UTC 2018 - 9+suse@cirno.systems + +- Enable libxml2 (used by MPEG DASH demuxer) + +------------------------------------------------------------------- +Wed Jun 27 23:15:36 UTC 2018 - jeng...@inai.de + +- Update to new upstream release 4.0.1 + * Fixed some integer overflows, undefined shifts, negative + shifts, division by 0, and a null pointer deref. + +------------------------------------------------------------------- +Mon Jun 18 16:33:12 UTC 2018 - bjorn....@gmail.com + +- Enable pkgconfig(vidstab) BuildRequires unconditionally, now + available in openSUSE. + +------------------------------------------------------------------- Old: ---- ffmpeg-4.0.tar.xz ffmpeg-4.0.tar.xz.asc New: ---- ffmpeg-4.0.1.tar.xz ffmpeg-4.0.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg.spec ++++++ --- /var/tmp/diff_new_pack.vqnBZn/_old 2018-07-02 23:31:09.481419796 +0200 +++ /var/tmp/diff_new_pack.vqnBZn/_new 2018-07-02 23:31:09.485419792 +0200 @@ -28,11 +28,8 @@ %bcond_with x265 %bcond_with xvid -# vidstab currently can't enter Factory due to legal review / unclarity. Temp disable -%bcond_with vidstab - Name: ffmpeg -Version: 4.0 +Version: 4.0.1 Release: 0 Summary: Library for working with various multimedia formats License: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -86,6 +83,7 @@ BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libva) >= 0.35.0 BuildRequires: pkgconfig(libwebp) >= 0.4 +BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libzmq) BuildRequires: pkgconfig(lilv-0) BuildRequires: pkgconfig(ogg) @@ -94,12 +92,11 @@ BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(soxr) BuildRequires: pkgconfig(speex) +BuildRequires: pkgconfig(srt) BuildRequires: pkgconfig(theora) >= 1.1 BuildRequires: pkgconfig(twolame) BuildRequires: pkgconfig(vdpau) -%if %{with vidstab} BuildRequires: pkgconfig(vidstab) >= 0.98 -%endif BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vpx) >= 1.4.0 BuildRequires: pkgconfig(x11) @@ -119,8 +116,8 @@ %if %{with librtmp} BuildRequires: pkgconfig(librtmp) %endif -%if %{with xvid} -BuildRequires: libxvidcore-devel +%if %{with nvidia} +BuildRequires: pkgconfig(ffnvcodec) %endif %if %{with opencore} BuildRequires: pkgconfig(opencore-amrnb) @@ -131,6 +128,9 @@ %if %{with x265} BuildRequires: pkgconfig(x265) %endif +%if %{with xvid} +BuildRequires: libxvidcore-devel +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ffmpeg-tools = %{version} Obsoletes: ffmpeg-tools < %{version} @@ -471,15 +471,15 @@ --enable-libsoxr \ --enable-libspeex \ --enable-libssh \ + --enable-libsrt \ --enable-libtheora \ --enable-libtwolame \ -%if %{with vidstab} --enable-libvidstab \ -%endif --enable-libvorbis \ --enable-libv4l2 \ --enable-libvpx \ --enable-libwebp \ + --enable-libxml2 \ --enable-libzimg \ --enable-libzmq \ --enable-libzvbi \ ++++++ cve-2017-17555.diff ++++++ --- /var/tmp/diff_new_pack.vqnBZn/_old 2018-07-02 23:31:09.509419762 +0200 +++ /var/tmp/diff_new_pack.vqnBZn/_new 2018-07-02 23:31:09.513419757 +0200 @@ -4,11 +4,11 @@ References: https://bugzilla.suse.com/show_bug.cgi?id=1072366 References: CVE-2017-17555 -diff --git a/libswresample/audioconvert.c b/libswresample/audioconvert.c -index 96ce84ac44..a2dae9c82d 100644 ---- a/libswresample/audioconvert.c -+++ b/libswresample/audioconvert.c -@@ -239,7 +239,7 @@ int swri_audio_convert(AudioConvert *ctx, AudioData *out, AudioData *in, int len +Index: ffmpeg-4.0.1/libswresample/audioconvert.c +=================================================================== +--- ffmpeg-4.0.1.orig/libswresample/audioconvert.c 2018-04-20 12:02:58.000000000 +0200 ++++ ffmpeg-4.0.1/libswresample/audioconvert.c 2018-06-30 00:17:17.785924731 +0200 +@@ -239,7 +239,7 @@ int swri_audio_convert(AudioConvert *ctx const uint8_t *pi= ich < 0 ? ctx->silence : in->ch[ich]; uint8_t *po= out->ch[ch]; uint8_t *end= po + os*len; ++++++ ffmpeg-4.0.tar.xz -> ffmpeg-4.0.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg-4.0.tar.xz /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg-4.0.1.tar.xz differ: char 26, line 1 ++++++ ffmpeg-codec-choice.diff ++++++ --- /var/tmp/diff_new_pack.vqnBZn/_old 2018-07-02 23:31:09.569419687 +0200 +++ /var/tmp/diff_new_pack.vqnBZn/_new 2018-07-02 23:31:09.573419682 +0200 @@ -11,11 +11,11 @@ libavformat/matroskaenc.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) -Index: ffmpeg-3.3.1/libavformat/matroskaenc.c +Index: ffmpeg-4.0.1/libavformat/matroskaenc.c =================================================================== ---- ffmpeg-3.3.1.orig/libavformat/matroskaenc.c 2017-04-13 03:55:55.000000000 +0200 -+++ ffmpeg-3.3.1/libavformat/matroskaenc.c 2017-05-31 13:39:12.379935754 +0200 -@@ -2653,16 +2653,24 @@ static const AVClass matroska_class = { +--- ffmpeg-4.0.1.orig/libavformat/matroskaenc.c 2018-04-20 12:02:57.000000000 +0200 ++++ ffmpeg-4.0.1/libavformat/matroskaenc.c 2018-06-30 00:17:17.773924594 +0200 +@@ -2747,16 +2747,24 @@ static const AVClass matroska_class = { .version = LIBAVUTIL_VERSION_INT, }; @@ -44,7 +44,7 @@ .init = mkv_init, .write_header = mkv_write_header, .write_packet = mkv_write_flush_packet, -@@ -2721,8 +2729,7 @@ AVOutputFormat ff_matroska_audio_muxer = +@@ -2815,8 +2823,7 @@ AVOutputFormat ff_matroska_audio_muxer = .mime_type = "audio/x-matroska", .extensions = "mka", .priv_data_size = sizeof(MatroskaMuxContext), ++++++ ffmpeg-libcdio_cdda-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.vqnBZn/_old 2018-07-02 23:31:09.581419673 +0200 +++ /var/tmp/diff_new_pack.vqnBZn/_new 2018-07-02 23:31:09.581419673 +0200 @@ -2,11 +2,11 @@ configure | 2 ++ 1 file changed, 2 insertions(+) -Index: ffmpeg-4.0/configure +Index: ffmpeg-4.0.1/configure =================================================================== ---- ffmpeg-4.0.orig/configure -+++ ffmpeg-4.0/configure -@@ -6242,6 +6242,8 @@ enabled libjack && +--- ffmpeg-4.0.1.orig/configure 2018-06-16 03:12:16.000000000 +0200 ++++ ffmpeg-4.0.1/configure 2018-06-30 00:17:17.733924139 +0200 +@@ -6243,6 +6243,8 @@ enabled libjack && enabled sndio && check_lib sndio sndio.h sio_open -lsndio if enabled libcdio; then ++++++ ffmpeg-new-coder-errors.diff ++++++ --- /var/tmp/diff_new_pack.vqnBZn/_old 2018-07-02 23:31:09.589419663 +0200 +++ /var/tmp/diff_new_pack.vqnBZn/_new 2018-07-02 23:31:09.589419663 +0200 @@ -10,11 +10,11 @@ fftools/ffmpeg_opt.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -Index: ffmpeg-3.4/fftools/ffmpeg.c +Index: ffmpeg-4.0.1/fftools/ffmpeg.c =================================================================== ---- ffmpeg-3.4.orig/fftools/ffmpeg.c -+++ ffmpeg-3.4/fftools/ffmpeg.c -@@ -2888,7 +2888,7 @@ static int init_input_stream(int ist_ind +--- ffmpeg-4.0.1.orig/fftools/ffmpeg.c 2018-06-16 03:12:16.000000000 +0200 ++++ ffmpeg-4.0.1/fftools/ffmpeg.c 2018-06-30 00:17:17.757924412 +0200 +@@ -2883,7 +2883,7 @@ static int init_input_stream(int ist_ind if (ist->decoding_needed) { AVCodec *codec = ist->dec; if (!codec) { @@ -23,11 +23,11 @@ avcodec_get_name(ist->dec_ctx->codec_id), ist->file_index, ist->st->index); return AVERROR(EINVAL); } -Index: ffmpeg-3.4/fftools/ffmpeg_filter.c +Index: ffmpeg-4.0.1/fftools/ffmpeg_filter.c =================================================================== ---- ffmpeg-3.4.orig/fftools/ffmpeg_filter.c -+++ ffmpeg-3.4/fftools/ffmpeg_filter.c -@@ -971,7 +971,7 @@ static int configure_input_filter(Filter +--- ffmpeg-4.0.1.orig/fftools/ffmpeg_filter.c 2018-04-20 12:02:55.000000000 +0200 ++++ ffmpeg-4.0.1/fftools/ffmpeg_filter.c 2018-06-30 00:17:17.757924412 +0200 +@@ -972,7 +972,7 @@ static int configure_input_filter(Filter { if (!ifilter->ist->dec) { av_log(NULL, AV_LOG_ERROR, @@ -36,7 +36,7 @@ ifilter->ist->file_index, ifilter->ist->st->index); return AVERROR_DECODER_NOT_FOUND; } -@@ -1121,7 +1121,7 @@ int configure_filtergraph(FilterGraph *f +@@ -1122,7 +1122,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 */ @@ -45,11 +45,11 @@ avcodec_get_name(ost->st->codecpar->codec_id), ost->file_index, ost->index); ret = AVERROR(EINVAL); goto fail; -Index: ffmpeg-3.4/fftools/ffmpeg_opt.c +Index: ffmpeg-4.0.1/fftools/ffmpeg_opt.c =================================================================== ---- ffmpeg-3.4.orig/fftools/ffmpeg_opt.c -+++ ffmpeg-3.4/fftools/ffmpeg_opt.c -@@ -1268,7 +1268,7 @@ static int choose_encoder(OptionsContext +--- ffmpeg-4.0.1.orig/fftools/ffmpeg_opt.c 2018-04-20 12:02:55.000000000 +0200 ++++ ffmpeg-4.0.1/fftools/ffmpeg_opt.c 2018-06-30 00:17:17.757924412 +0200 +@@ -1277,7 +1277,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 "