Hello community, here is the log from the commit of package ffmpeg-4 for openSUSE:Factory checked in at 2019-08-07 13:55:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg-4 (Old) and /work/SRC/openSUSE:Factory/.ffmpeg-4.new.9556 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg-4" Wed Aug 7 13:55:16 2019 rev:16 rq:721323 version:4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg-4/ffmpeg-4.changes 2019-07-08 15:05:29.426939656 +0200 +++ /work/SRC/openSUSE:Factory/.ffmpeg-4.new.9556/ffmpeg-4.changes 2019-08-07 13:55:21.824856861 +0200 @@ -1,0 +2,56 @@ +Tue Aug 6 15:35:35 UTC 2019 - Ismail Dönmez <idon...@suse.com> + +- Update to FFmpeg 4.2 "Ada" + * tpad filter + * AV1 decoding support through libdav1d + * dedot filter + * chromashift and rgbashift filters + * freezedetect filter + * truehd_core bitstream filter + * dhav demuxer + * PCM-DVD encoder + * GIF parser + * vividas demuxer + * hymt decoder + * anlmdn filter + * maskfun filter + * hcom demuxer and decoder + * ARBC decoder + * libaribb24 based ARIB STD-B24 caption support (profiles A and C) + * Support decoding of HEVC 4:4:4 content in nvdec and cuviddec + * removed libndi-newtek + * agm decoder + * KUX demuxer + * AV1 frame split bitstream filter + * lscr decoder + * lagfun filter + * asoftclip filter + * Support decoding of HEVC 4:4:4 content in vdpau + * colorhold filter + * xmedian filter + * asr filter + * showspatial multimedia filter + * VP4 video decoder + * IFV demuxer + * derain filter + * deesser filter + * mov muxer writes tracks with unspecified language instead + of English by default + * added support for using clang to compile CUDA kernels +- Drop ffmpeg-avcodec-libdav1d-AV1-decoder-wrapper.patch, merged + upstream. +- Rebase and rename + ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch + to + ffmpeg-4.2-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch +- See /usr/share/doc/packages/ffmpeg-4/Changelog for the complete + changelog. + +------------------------------------------------------------------- +Wed Jul 31 13:27:44 UTC 2019 - Ismail Dönmez <idon...@suse.com> + +- Update to version 4.1.4 + * See /usr/share/doc/packages/ffmpeg-4/Changelog for the complete + changelog. + +------------------------------------------------------------------- Old: ---- ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch ffmpeg-4.1.3.tar.xz ffmpeg-4.1.3.tar.xz.asc ffmpeg-avcodec-libdav1d-AV1-decoder-wrapper.patch New: ---- ffmpeg-4.2-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch ffmpeg-4.2.tar.xz ffmpeg-4.2.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg-4.spec ++++++ --- /var/tmp/diff_new_pack.SfeT0r/_old 2019-08-07 13:55:23.236856846 +0200 +++ /var/tmp/diff_new_pack.SfeT0r/_new 2019-08-07 13:55:23.240856846 +0200 @@ -97,7 +97,7 @@ %define _major_version 4 %define _major_expected 5 Name: ffmpeg-4 -Version: 4.1.3 +Version: 4.2 Release: 0 Summary: Library for working with various multimedia formats License: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -115,10 +115,8 @@ Patch2: ffmpeg-arm6l.diff Patch3: ffmpeg-new-coder-errors.diff Patch4: ffmpeg-codec-choice.diff -# dav1d added https://patchwork.ffmpeg.org/patch/10843/ -Patch6: ffmpeg-avcodec-libdav1d-AV1-decoder-wrapper.patch # https://github.com/OpenMandrivaAssociation/ffmpeg/blob/master/ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch -Patch7: ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch +Patch6: ffmpeg-4.2-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel ++++++ ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch -> ffmpeg-4.2-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch ++++++ --- /work/SRC/openSUSE:Factory/ffmpeg-4/ffmpeg-4.1-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch 2019-07-08 15:05:29.354939547 +0200 +++ /work/SRC/openSUSE:Factory/.ffmpeg-4.new.9556/ffmpeg-4.2-dlopen-faac-mp3lame-opencore-x264-x265-xvid.patch 2019-08-07 13:55:20.248856879 +0200 @@ -1,8 +1,8 @@ -Index: ffmpeg-4.1.3/configure +Index: ffmpeg-4.2/configure =================================================================== ---- ffmpeg-4.1.3.orig/configure -+++ ffmpeg-4.1.3/configure -@@ -231,6 +231,7 @@ External library support: +--- ffmpeg-4.2.orig/configure ++++ ffmpeg-4.2/configure +@@ -232,6 +232,7 @@ External library support: --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394 and libraw1394 [no] --enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no] @@ -10,7 +10,7 @@ --enable-libflite enable flite (voice synthesis) support via libflite [no] --enable-libfontconfig enable libfontconfig, useful for drawtext filter [no] --enable-libfreetype enable libfreetype, needed for drawtext filter [no] -@@ -245,8 +246,11 @@ External library support: +@@ -246,8 +247,11 @@ External library support: --enable-liblensfun enable lensfun lens correction [no] --enable-libmodplug enable ModPlug via libmodplug [no] --enable-libmp3lame enable MP3 encoding via libmp3lame [no] @@ -22,7 +22,7 @@ --enable-libopencv enable video filtering via libopencv [no] --enable-libopenh264 enable H.264 encoding via OpenH264 [no] --enable-libopenjpeg enable JPEG 2000 de/encoding via OpenJPEG [no] -@@ -280,7 +284,9 @@ External library support: +@@ -281,7 +285,9 @@ External library support: --enable-libwavpack enable wavpack encoding via libwavpack [no] --enable-libwebp enable WebP encoding via libwebp [no] --enable-libx264 enable H.264 encoding via x264 [no] @@ -32,7 +32,7 @@ --enable-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] -@@ -289,6 +295,7 @@ External library support: +@@ -290,6 +296,7 @@ External library support: --enable-libxcb-shape enable X11 grabbing shape rendering [autodetect] --enable-libxvid enable Xvid encoding via xvidcore, native MPEG-4/Xvid encoder exists [no] @@ -40,7 +40,7 @@ --enable-libxml2 enable XML parsing using the C library libxml2, needed for dash demuxing support [no] --enable-libzimg enable z.lib, needed for zscale filter [no] -@@ -1667,16 +1674,20 @@ EXTERNAL_LIBRARY_GPL_LIST=" +@@ -1715,15 +1722,19 @@ EXTERNAL_LIBRARY_GPL_LIST=" librubberband libvidstab libx264 @@ -55,14 +55,13 @@ EXTERNAL_LIBRARY_NONFREE_LIST=" decklink - libndi_newtek libfdk_aac + libfdk_aac_dlopen openssl libtls " -@@ -1685,7 +1696,9 @@ EXTERNAL_LIBRARY_VERSION3_LIST=" - gmp +@@ -1733,7 +1744,9 @@ EXTERNAL_LIBRARY_VERSION3_LIST=" + libaribb24 liblensfun libopencore_amrnb + libopencore_amrnb_dlopen @@ -71,7 +70,7 @@ libvmaf libvo_amrwbenc mbedtls -@@ -1729,6 +1742,7 @@ EXTERNAL_LIBRARY_LIST=" +@@ -1777,6 +1790,7 @@ EXTERNAL_LIBRARY_LIST=" libkvazaar libmodplug libmp3lame @@ -79,7 +78,7 @@ libmysofa libopencv libopenh264 -@@ -6079,6 +6093,7 @@ enabled libdrm && require_pkg +@@ -6203,6 +6217,7 @@ enabled libdrm && require_pkg enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && warn "using libfdk without pkg-config"; } } @@ -87,7 +86,7 @@ flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs enabled fontconfig && enable libfontconfig -@@ -6104,13 +6119,16 @@ enabled libmfx && { check_pkg +@@ -6228,13 +6243,16 @@ enabled libmfx && { check_pkg { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs @@ -104,7 +103,7 @@ enabled libopencv && { check_headers opencv2/core/core_c.h && { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader || require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || -@@ -6186,11 +6204,14 @@ enabled libx264 && { check_pkg +@@ -6308,11 +6326,14 @@ enabled libx264 && { check_pkg warn "using libx264 without pkg-config"; } } && require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && check_cpp_condition libx262 x264.h "X264_MPEG2" @@ -113,16 +112,16 @@ require_cpp_condition libx265 x265.h "X265_BUILD >= 68" +enabled libx265_dlopen && enable libx265 enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" - enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.2.77" "stdint.h xavs2.h" xavs2_api_get + enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore +enabled libxvid_dlopen && enable libxvid enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version enabled libzmq && require_pkg_config libzmq libzmq zmq.h zmq_ctx_new enabled libzvbi && require_pkg_config libzvbi zvbi-0.2 libzvbi.h vbi_decoder_new && -Index: ffmpeg-4.1.3/libavcodec/dlopen.h +Index: ffmpeg-4.2/libavcodec/dlopen.h =================================================================== --- /dev/null -+++ ffmpeg-4.1.3/libavcodec/dlopen.h ++++ ffmpeg-4.2/libavcodec/dlopen.h @@ -0,0 +1,13 @@ +#ifndef LOCALINC_DLOPEN_H +#define LOCALINC_DLOPEN_H @@ -137,11 +136,11 @@ + goto error; + +#endif -Index: ffmpeg-4.1.3/libavcodec/libfdk-aacdec.c +Index: ffmpeg-4.2/libavcodec/libfdk-aacdec.c =================================================================== ---- ffmpeg-4.1.3.orig/libavcodec/libfdk-aacdec.c -+++ ffmpeg-4.1.3/libavcodec/libfdk-aacdec.c -@@ -37,6 +39,54 @@ +--- ffmpeg-4.2.orig/libavcodec/libfdk-aacdec.c ++++ ffmpeg-4.2/libavcodec/libfdk-aacdec.c +@@ -37,6 +37,54 @@ #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS #endif @@ -196,7 +195,7 @@ enum ConcealMethod { CONCEAL_METHOD_SPECTRAL_MUTING = 0, CONCEAL_METHOD_NOISE_SUBSTITUTION = 1, -@@ -224,6 +274,11 @@ static av_cold int fdk_aac_decode_init(A +@@ -224,6 +272,11 @@ static av_cold int fdk_aac_decode_init(A FDKAACDecContext *s = avctx->priv_data; AAC_DECODER_ERROR err; @@ -208,10 +207,10 @@ s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1); if (!s->handle) { av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n"); -Index: ffmpeg-4.1.3/libavcodec/libfdk-aacenc.c +Index: ffmpeg-4.2/libavcodec/libfdk-aacenc.c =================================================================== ---- ffmpeg-4.1.3.orig/libavcodec/libfdk-aacenc.c -+++ ffmpeg-4.1.3/libavcodec/libfdk-aacenc.c +--- ffmpeg-4.2.orig/libavcodec/libfdk-aacenc.c ++++ ffmpeg-4.2/libavcodec/libfdk-aacenc.c @@ -34,6 +34,48 @@ #define FDKENC_VER_AT_LEAST(vl0, vl1) 0 #endif @@ -273,10 +272,10 @@ if ((err = aacEncOpen(&s->handle, 0, avctx->channels)) != AACENC_OK) { av_log(avctx, AV_LOG_ERROR, "Unable to open the encoder: %s\n", aac_get_error(err)); -Index: ffmpeg-4.1.3/libavcodec/libmp3lame.c +Index: ffmpeg-4.2/libavcodec/libmp3lame.c =================================================================== ---- ffmpeg-4.1.3.orig/libavcodec/libmp3lame.c -+++ ffmpeg-4.1.3/libavcodec/libmp3lame.c +--- ffmpeg-4.2.orig/libavcodec/libmp3lame.c ++++ ffmpeg-4.2/libavcodec/libmp3lame.c @@ -38,6 +38,145 @@ #include "mpegaudio.h" #include "mpegaudiodecheader.h" @@ -435,10 +434,10 @@ s->avctx = avctx; /* initialize LAME and get defaults */ -Index: ffmpeg-4.1.3/libavcodec/libopencore-amr.c +Index: ffmpeg-4.2/libavcodec/libopencore-amr.c =================================================================== ---- ffmpeg-4.1.3.orig/libavcodec/libopencore-amr.c -+++ ffmpeg-4.1.3/libavcodec/libopencore-amr.c +--- ffmpeg-4.2.orig/libavcodec/libopencore-amr.c ++++ ffmpeg-4.2/libavcodec/libopencore-amr.c @@ -29,6 +29,108 @@ #include "audio_frame_queue.h" #include "internal.h" @@ -593,13 +592,13 @@ s->state = D_IF_init(); return 0; -Index: ffmpeg-4.1.3/libavcodec/libx264.c +Index: ffmpeg-4.2/libavcodec/libx264.c =================================================================== ---- ffmpeg-4.1.3.orig/libavcodec/libx264.c -+++ ffmpeg-4.1.3/libavcodec/libx264.c -@@ -40,6 +40,120 @@ - #include <stdlib.h> - #include <string.h> +--- ffmpeg-4.2.orig/libavcodec/libx264.c ++++ ffmpeg-4.2/libavcodec/libx264.c +@@ -44,6 +44,120 @@ + // blocks of pixels (with respect to the luma plane) + #define MB_SIZE 16 +#ifdef CONFIG_LIBX264_DLOPEN +#include "dlopen.h" @@ -718,7 +717,7 @@ typedef struct X264Context { AVClass *class; x264_param_t params; -@@ -468,6 +582,11 @@ static av_cold int X264_init(AVCodecCont +@@ -555,6 +669,11 @@ static av_cold int X264_init(AVCodecCont if (avctx->global_quality > 0) av_log(avctx, AV_LOG_WARNING, "-qscale is ignored, -crf is recommended.\n"); @@ -730,10 +729,10 @@ #if CONFIG_LIBX262_ENCODER if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO) { x4->params.b_mpeg2 = 1; -Index: ffmpeg-4.1.3/libavcodec/libx265.c +Index: ffmpeg-4.2/libavcodec/libx265.c =================================================================== ---- ffmpeg-4.1.3.orig/libavcodec/libx265.c -+++ ffmpeg-4.1.3/libavcodec/libx265.c +--- ffmpeg-4.2.orig/libavcodec/libx265.c ++++ ffmpeg-4.2/libavcodec/libx265.c @@ -34,6 +34,39 @@ #include "avcodec.h" #include "internal.h" @@ -774,7 +773,7 @@ typedef struct libx265Context { const AVClass *class; -@@ -417,6 +450,10 @@ static const enum AVPixelFormat x265_csp +@@ -514,6 +547,10 @@ static const enum AVPixelFormat x265_csp static av_cold void libx265_encode_init_csp(AVCodec *codec) { @@ -785,10 +784,10 @@ if (x265_api_get(12)) codec->pix_fmts = x265_csp_twelve; else if (x265_api_get(10)) -Index: ffmpeg-4.1.3/libavcodec/libxvid.c +Index: ffmpeg-4.2/libavcodec/libxvid.c =================================================================== ---- ffmpeg-4.1.3.orig/libavcodec/libxvid.c -+++ ffmpeg-4.1.3/libavcodec/libxvid.c +--- ffmpeg-4.2.orig/libavcodec/libxvid.c ++++ ffmpeg-4.2/libavcodec/libxvid.c @@ -51,6 +51,61 @@ #include <io.h> #endif ++++++ ffmpeg-4.1.3.tar.xz -> ffmpeg-4.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/ffmpeg-4/ffmpeg-4.1.3.tar.xz /work/SRC/openSUSE:Factory/.ffmpeg-4.new.9556/ffmpeg-4.2.tar.xz differ: char 26, line 1 ++++++ ffmpeg-codec-choice.diff ++++++ --- /var/tmp/diff_new_pack.SfeT0r/_old 2019-08-07 13:55:23.488856843 +0200 +++ /var/tmp/diff_new_pack.SfeT0r/_new 2019-08-07 13:55:23.488856843 +0200 @@ -11,11 +11,11 @@ libavformat/matroskaenc.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) -Index: ffmpeg-4.1.3/libavformat/matroskaenc.c +Index: ffmpeg-4.2/libavformat/matroskaenc.c =================================================================== ---- ffmpeg-4.1.3.orig/libavformat/matroskaenc.c -+++ ffmpeg-4.1.3/libavformat/matroskaenc.c -@@ -2807,16 +2807,24 @@ static const AVClass matroska_class = { +--- ffmpeg-4.2.orig/libavformat/matroskaenc.c ++++ ffmpeg-4.2/libavformat/matroskaenc.c +@@ -2798,16 +2798,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, -@@ -2876,8 +2884,7 @@ AVOutputFormat ff_matroska_audio_muxer = +@@ -2867,8 +2875,7 @@ AVOutputFormat ff_matroska_audio_muxer = .mime_type = "audio/x-matroska", .extensions = "mka", .priv_data_size = sizeof(MatroskaMuxContext), ++++++ ffmpeg-new-coder-errors.diff ++++++ --- /var/tmp/diff_new_pack.SfeT0r/_old 2019-08-07 13:55:23.500856843 +0200 +++ /var/tmp/diff_new_pack.SfeT0r/_new 2019-08-07 13:55:23.500856843 +0200 @@ -10,11 +10,11 @@ fftools/ffmpeg_opt.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -Index: ffmpeg-4.1.3/fftools/ffmpeg.c +Index: ffmpeg-4.2/fftools/ffmpeg.c =================================================================== ---- ffmpeg-4.1.3.orig/fftools/ffmpeg.c -+++ ffmpeg-4.1.3/fftools/ffmpeg.c -@@ -2906,7 +2906,7 @@ static int init_input_stream(int ist_ind +--- ffmpeg-4.2.orig/fftools/ffmpeg.c ++++ ffmpeg-4.2/fftools/ffmpeg.c +@@ -2898,7 +2898,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-4.1.3/fftools/ffmpeg_filter.c +Index: ffmpeg-4.2/fftools/ffmpeg_filter.c =================================================================== ---- ffmpeg-4.1.3.orig/fftools/ffmpeg_filter.c -+++ ffmpeg-4.1.3/fftools/ffmpeg_filter.c -@@ -973,7 +973,7 @@ static int configure_input_filter(Filter +--- ffmpeg-4.2.orig/fftools/ffmpeg_filter.c ++++ ffmpeg-4.2/fftools/ffmpeg_filter.c +@@ -981,7 +981,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; } -@@ -1123,7 +1123,7 @@ int configure_filtergraph(FilterGraph *f +@@ -1131,7 +1131,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-4.1.3/fftools/ffmpeg_opt.c +Index: ffmpeg-4.2/fftools/ffmpeg_opt.c =================================================================== ---- ffmpeg-4.1.3.orig/fftools/ffmpeg_opt.c -+++ ffmpeg-4.1.3/fftools/ffmpeg_opt.c -@@ -1306,7 +1306,7 @@ static int choose_encoder(OptionsContext +--- ffmpeg-4.2.orig/fftools/ffmpeg_opt.c ++++ ffmpeg-4.2/fftools/ffmpeg_opt.c +@@ -1327,7 +1327,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 "
