commit ffmpeg-2 for openSUSE:Factory

2019-02-13 Thread root 
Hello community,

here is the log from the commit of package ffmpeg-2 for openSUSE:Factory 
checked in at 2019-02-13 10:04:27

Comparing /work/SRC/openSUSE:Factory/ffmpeg-2 (Old)
 and  /work/SRC/openSUSE:Factory/.ffmpeg-2.new.28833 (New)


Package is "ffmpeg-2"

Wed Feb 13 10:04:27 2019 rev:4 rq:673563 version:2.8.15

Changes:

--- /work/SRC/openSUSE:Factory/ffmpeg-2/ffmpeg-2.changes2018-08-07 
09:43:28.145350849 +0200
+++ /work/SRC/openSUSE:Factory/.ffmpeg-2.new.28833/ffmpeg-2.changes 
2019-02-13 10:04:37.749572581 +0100
@@ -1,0 +2,6 @@
+Mon Feb 11 21:43:44 UTC 2019 - bjorn@gmail.com
+
+- Add ffmpeg-fix-build-fdk-aac2.patch: Fix build with updated
+  fdk-aac. Patch backported from upstream master.
+
+---

New:

  ffmpeg-fix-build-fdk-aac2.patch



Other differences:
--
++ ffmpeg-2.spec ++
--- /var/tmp/diff_new_pack.fjyzI5/_old  2019-02-13 10:04:41.829571560 +0100
+++ /var/tmp/diff_new_pack.fjyzI5/_new  2019-02-13 10:04:41.833571559 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ffmpeg-2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -75,6 +75,7 @@
 Patch3: ffmpeg-pkgconfig-version.patch
 Patch4: ffmpeg-new-coder-errors.diff
 Patch5: ffmpeg-codec-choice.diff
+Patch6: ffmpeg-fix-build-fdk-aac2.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  libmp3lame-devel


++ ffmpeg-fix-build-fdk-aac2.patch ++
>From 141c960e21d2860e354f9b90df136184dd00a9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= 
Date: Fri, 31 Aug 2018 14:25:30 +0300
Subject: [PATCH] libfdk-aacenc: Fix building with libfdk-aac v2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When flushing the encoder, we now need to provide non-null buffer
parameters for everything, even if they are unused.

The encoderDelay parameter has been replaced by two, nDelay and
nDelayCore.

Signed-off-by: Martin Storsjö 
---
 libavcodec/libfdk-aacenc.c | 34 +-
 1 file changed, 25 insertions(+), 9 deletions(-)

Index: ffmpeg-2.8.15/libavcodec/libfdk-aacenc.c
===
--- ffmpeg-2.8.15.orig/libavcodec/libfdk-aacenc.c
+++ ffmpeg-2.8.15/libavcodec/libfdk-aacenc.c
@@ -26,6 +26,11 @@
 #include "audio_frame_queue.h"
 #include "internal.h"
 
+#define FDKENC_VER_AT_LEAST(vl0, vl1) \
+(defined(AACENCODER_LIB_VL0) && \
+((AACENCODER_LIB_VL0 > vl0) || \
+ (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1)))
+
 typedef struct AACContext {
 const AVClass *class;
 HANDLE_AACENCODER handle;
@@ -286,7 +291,11 @@ static av_cold int aac_encode_init(AVCod
 }
 
 avctx->frame_size = info.frameLength;
+#if FDKENC_VER_AT_LEAST(4, 0)
+avctx->initial_padding = info.nDelay;
+#else
 avctx->initial_padding = info.encoderDelay;
+#endif
 ff_af_queue_init(avctx, &s->afq);
 
 if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
@@ -319,28 +328,35 @@ static int aac_encode_frame(AVCodecConte
 int out_buffer_size, out_buffer_element_size;
 void *in_ptr, *out_ptr;
 int ret;
+uint8_t dummy_buf[1];
 AACENC_ERROR err;
 
 /* handle end-of-stream small frame and flushing */
 if (!frame) {
+/* Must be a non-null pointer, even if it's a dummy. We could use
+ * the address of anything else on the stack as well. */
+in_ptr   = dummy_buf;
+in_buffer_size   = 0;
+
 in_args.numInSamples = -1;
 } else {
-in_ptr   = frame->data[0];
-in_buffer_size   = 2 * avctx->channels * frame->nb_samples;
-in_buffer_element_size   = 2;
-
-in_args.numInSamples = avctx->channels * frame->nb_samples;
-in_buf.numBufs   = 1;
-in_buf.bufs  = &in_ptr;
-in_buf.bufferIdentifiers = &in_buffer_identifier;
-in_buf.bufSizes  = &in_buffer_size;
-in_buf.bufElSizes= &in_buffer_element_size;
+in_ptr   = frame->data[0];
+in_buffer_size   = 2 * avctx->channels * frame->nb_samples;
+
+in

commit ffmpeg-2 for openSUSE:Factory

2018-08-07 Thread root 
Hello community,

here is the log from the commit of package ffmpeg-2 for openSUSE:Factory 
checked in at 2018-08-07 09:43:26

Comparing /work/SRC/openSUSE:Factory/ffmpeg-2 (Old)
 and  /work/SRC/openSUSE:Factory/.ffmpeg-2.new (New)


Package is "ffmpeg-2"

Tue Aug  7 09:43:26 2018 rev:3 rq:627680 version:2.8.15

Changes:

--- /work/SRC/openSUSE:Factory/ffmpeg-2/ffmpeg-2.changes2018-07-28 
12:41:56.480603273 +0200
+++ /work/SRC/openSUSE:Factory/.ffmpeg-2.new/ffmpeg-2.changes   2018-08-07 
09:43:28.145350849 +0200
@@ -1,0 +2,6 @@
+Tue Jul 31 14:39:25 UTC 2018 - tchva...@suse.com
+
+- bsc#1103064 attempt to allow migration from the unprefixed devel
+  packages cleanly
+
+---



Other differences:
--
++ ffmpeg-2.spec ++
--- /var/tmp/diff_new_pack.BWbwi2/_old  2018-08-07 09:43:30.097354246 +0200
+++ /var/tmp/diff_new_pack.BWbwi2/_new  2018-08-07 09:43:30.101354253 +0200
@@ -187,7 +187,7 @@
 Summary:Development files for FFmpeg's codec library
 Group:  Development/Libraries/C and C++
 Provides:   libavcodec-devel = %version-%release
-Conflicts:  libavcodec-devel
+Obsoletes:  libavcodec-devel < %version-%release
 Requires:   %{name}-libavresample-devel = %version-%release
 Requires:   %{name}-libavutil-devel = %version-%release
 Requires:   libavcodec56 = %version-%release
@@ -223,7 +223,7 @@
 Provides:   ffmpeg2-devel = %version-%release
 Obsoletes:  ffmpeg2-devel < %version-%release
 Provides:   libavdevice-devel = %version-%release
-Conflicts:  libavdevice-devel
+Obsoletes:  libavdevice-devel < %version-%release
 Requires:   %{name}-libavcodec-devel = %version-%release
 Requires:   %{name}-libavfilter-devel = %version-%release
 Requires:   %{name}-libavformat-devel = %version-%release
@@ -263,7 +263,7 @@
 Summary:Development files for FFmpeg's audio/video filter library
 Group:  Development/Libraries/C and C++
 Provides:   libavfilter-devel = %version-%release
-Conflicts:  libavfilter-devel
+Obsoletes:  libavfilter-devel < %version-%release
 Requires:   %{name}-libavcodec-devel = %version-%release
 Requires:   %{name}-libavformat-devel = %version-%release
 Requires:   %{name}-libavresample-devel = %version-%release
@@ -301,7 +301,7 @@
 Summary:Development files for FFmpeg's stream format library
 Group:  Development/Libraries/C and C++
 Provides:   libavformat-devel = %version-%release
-Conflicts:  libavformat-devel
+Obsoletes:  libavformat-devel < %version-%release
 Requires:   %{name}-libavcodec-devel = %version-%release
 Requires:   %{name}-libswresample-devel = %version-%release
 Requires:   libavformat56 = %version-%release
@@ -332,7 +332,7 @@
 Summary:Development files for libavresample as present in FFmpeg
 Group:  Development/Libraries/C and C++
 Provides:   libavresample-devel = %version-%release
-Conflicts:  libavresample-devel
+Obsoletes:  libavresample-devel < %version-%release
 Requires:   %{name}-libavutil-devel = %version-%release
 Requires:   libavresample2 = %version-%release
 %devel_conflicts -c < -v %{_major_version}
@@ -361,7 +361,7 @@
 Summary:Development files for FFmpeg's utility library
 Group:  Development/Libraries/C and C++
 Provides:   libavutil-devel = %version-%release
-Conflicts:  libavutil-devel
+Obsoletes:  libavutil-devel < %version-%release
 Requires:   libavutil54 = %version-%release
 %devel_conflicts -c < -v %{_major_version}
 %devel_conflicts -c >= -v %{_major_expected}
@@ -389,7 +389,7 @@
 Summary:Development files for the FFmpeg post-processing library
 Group:  Development/Libraries/C and C++
 Provides:   libpostproc-devel = %version-%release
-Conflicts:  libpostproc-devel
+Obsoletes:  libpostproc-devel < %version-%release
 Requires:   %{name}-libavutil-devel = %version-%release
 Requires:   libpostproc53 = %version
 %devel_conflicts -c < -v %{_major_version}
@@ -415,7 +415,7 @@
 Summary:Development files for the FFmpeg software resampling library
 Group:  Development/Libraries/C and C++
 Provides:   libswresample-devel = %version-%release
-Conflicts:  libswresample-devel
+Obsoletes:  libswresample-devel < %version-%release
 Requires:   %{name}-libavutil-devel = %version-%release
 Requires:   libswresample1 = %version-%release
 %devel_conflicts -c < -v %{_major_version}

commit ffmpeg-2 for openSUSE:Factory

2018-07-28 Thread root 
Hello community,

here is the log from the commit of package ffmpeg-2 for openSUSE:Factory 
checked in at 2018-07-28 12:41:41

Comparing /work/SRC/openSUSE:Factory/ffmpeg-2 (Old)
 and  /work/SRC/openSUSE:Factory/.ffmpeg-2.new (New)


Package is "ffmpeg-2"

Sat Jul 28 12:41:41 2018 rev:2 rq:624535 version:2.8.15

Changes:

--- /work/SRC/openSUSE:Factory/ffmpeg-2/ffmpeg-2.changes2018-07-12 
09:16:24.738187308 +0200
+++ /work/SRC/openSUSE:Factory/.ffmpeg-2.new/ffmpeg-2.changes   2018-07-28 
12:41:56.480603273 +0200
@@ -1,0 +2,101 @@
+Sun Jul 22 09:54:48 UTC 2018 - tchva...@suse.com
+
+- Version update to 2.8.15:
+  * avcodec/dvdsub_parser: Allocate input padding
+  * avcodec/dvdsub_parser: Init output buf/size
+  * avcodec/imgconvert: fix possible null pointer dereference
+  * swresample/arm: rename labels to fix xcode build error
+  * avformat/utils: fix mixed declarations and code
+  * libwebpenc_animencoder: add missing braces to struct initialization
+  * avformat/movenc: Check input sample count
+  * avcodec/mjpegdec: Check for odd progressive RGB
+  * avformat/movenc: Check that frame_types other than 
EAC3_FRAME_TYPE_INDEPENDENT have a supported substream id
+  * avformat/mms: Add missing chunksize check
+  * avformat/pva: Check for EOF before retrying in read_part_of_packet()
+  * avcodec/indeo4: Check for end of bitstream in decode_mb_info()
+  * avcodec/shorten: Fix undefined addition in shorten_decode_frame()
+  * avcodec/jpeg2000dec: Fixes invalid shifts in 
jpeg2000_decode_packets_po_iteration()
+  * avcodec/jpeg2000dec: Check that there are enough bytes for all tiles
+  * avcodec/escape124: Fix spelling errors in comment
+  * avcodec/ra144: Fix integer overflow in ff_eval_refl()
+  * avcodec/cscd: Check output buffer size for lzo.
+  * avcodec/escape124: Check buf_size against num_superblocks
+  * avcodec/mjpegdec: Check for end of bitstream in ljpeg_decode_rgb_scan()
+  * avcodec/aacdec_fixed: Fix undefined integer overflow in 
apply_independent_coupling_fixed()
+  * avutil/common: Fix undefined behavior in av_clip_uintp2_c()
+  * fftools/ffmpeg: Fallback to duration if sample rate is unavailable
+  * avformat/mov: Only set pkt->duration to non negative values
+  * avcodec/h264_mc_template: Only prefetch motion if the list is used.
+  * avcodec/xwddec: Use ff_set_dimensions()
+  * avcodec/wavpack: Fix overflow in adding tail
+  * avcodec/shorten: Fix multiple integer overflows
+  * avcodec/shorten: Sanity check nmeans
+  * avcodec/mjpegdec: Fix integer overflow in ljpeg_decode_rgb_scan()
+  * avcodec/truemotion2: Fix overflow in tm2_apply_deltas()
+  * avcodec/opus_silk: Change silk_lsf2lpc() slightly toward silk/NLSF2A.c
+  * avcodec/amrwbdec: Fix division by 0 in find_hb_gain()
+  * avformat/mov: replace a value error by clipping into valid range in 
mov_read_stsc()
+  * avformat/mov: Break out early if chunk_count is 0 in mov_build_index()
+  * avcodec/fic: Avoid some magic numbers related to cursors
+  * avcodec/g2meet: ask for sample with overflowing RGB
+  * avcodec/aacdec_fixed: use 64bit to avoid overflow in rounding in 
apply_dependent_coupling_fixed()
+  * avcodec/mpeg4videoenc: Use 64 bit for times in mpeg4_encode_gop_header()
+  * avcodec/mlpdec: Only change noise_type if the related fields are valid
+  * indeo4: Decode all or nothing of a band header.
+  * avformat/mov: Only fail for STCO/STSC contradictions if both exist
+  * avcodec/dirac_dwt: Fix integer overflow in COMPOSE_DD97iH0 / 
COMPOSE_DD137iL0
+  * avcodec/fic: Check available input space for cursor
+  * avcodec/g2meet: Check RGB upper limit
+  * avcodec/jpeg2000dec: Fix undefined shift in the 
jpeg2000_decode_packets_po_iteration() CPRL case
+  * avcodec/jpeg2000dec: Skip init for component in CPRL if nothing is to be 
done
+  * avcodec/g2meet: Change order of operations to avoid undefined behavior
+  * avcodec/flac_parser: Fix infinite loop
+  * avcodec/wavpack: Fix integer overflow in DEC_MED() / INC_MED()
+  * avcodec/error_resilience: Fix integer overflow in filter181()
+  * avcodec/h263dec: Check slice_ret in mspeg4 slice loop
+  * avcodec/elsdec: Fix memleaks
+  * avcodec/vc1_block: simplify ac_val computation
+  * avcodec/ffv1enc: Check that the crc + version combination is supported
+  * lavf/http.c: Free allocated client URLContext in case of error.
+  * avcodec/dsicinvideo: Fail if there is only a small fraction of the data 
available that comprises a full frame
+  * avcodec/dsicinvideo: Propagate errors from cin_decode_rle()
+  * avcodec/dfa: Check dimension against maximum
+  * avcodec/cinepak: Skip empty frames
+  * avcodec/cinepak: move some checks prior to frame allocation
+  * swresample/arm: remove unintentional relocation.
+  * doc/APIchanges: Fix typos in hashes
+  * avformat/utils: Check cur_dts in update_initial_timestamps() more
+  * avc