Hello community,

here is the log from the commit of package ffmpeg2 for openSUSE:Factory checked 
in at 2016-10-14 09:05:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ffmpeg2 (Old)
 and      /work/SRC/openSUSE:Factory/.ffmpeg2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ffmpeg2"

Changes:
--------
--- /work/SRC/openSUSE:Factory/ffmpeg2/ffmpeg2.changes  2016-09-30 
15:24:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ffmpeg2.new/ffmpeg2.changes     2016-10-14 
09:05:32.000000000 +0200
@@ -1,0 +2,17 @@
+Sat Oct  8 17:44:47 UTC 2016 - jeng...@inai.de
+
+- Add 0001-avcodec-ansi-Check-dimensions.patch,
+  0001-avcodec-cavsdsp-use-av_clip_uint8-for-idct.patch
+  0001-avformat-avidec-Check-nb_streams-in-read_gab2_sub.patch
+  0001-avformat-avidec-Remove-ancient-assert.patch [boo#1003806]
+
+-------------------------------------------------------------------
+Wed Sep 28 18:42:19 UTC 2016 - dims...@opensuse.org
+
+- Have libavcodec56 additionally provide libavcodec56(unrestricted)
+  when building unrestricted: allow third party packages to require
+  the unrestricted codec. The existing -full provides is not
+  suitable as it can be provided by multiple libavcodec* packages,
+  whereas we require a specific ABI version.
+
+-------------------------------------------------------------------

New:
----
  0001-avcodec-ansi-Check-dimensions.patch
  0001-avcodec-cavsdsp-use-av_clip_uint8-for-idct.patch
  0001-avformat-avidec-Check-nb_streams-in-read_gab2_sub.patch
  0001-avformat-avidec-Remove-ancient-assert.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ffmpeg2.spec ++++++
--- /var/tmp/diff_new_pack.NDibJS/_old  2016-10-14 09:05:34.000000000 +0200
+++ /var/tmp/diff_new_pack.NDibJS/_new  2016-10-14 09:05:34.000000000 +0200
@@ -55,6 +55,10 @@
 Patch4:         ffmpeg-new-coder-errors.diff
 Patch5:         ffmpeg-codec-choice.diff
 Patch6:         0001-avcodec-exr-Check-tile-positions.patch
+Patch7:         0001-avcodec-ansi-Check-dimensions.patch
+Patch8:         0001-avcodec-cavsdsp-use-av_clip_uint8-for-idct.patch
+Patch9:         0001-avformat-avidec-Remove-ancient-assert.patch
+Patch10:        0001-avformat-avidec-Check-nb_streams-in-read_gab2_sub.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  pkg-config
@@ -152,6 +156,8 @@
 Provides:       libavcodec = %version-%release
 %if 0%{?BUILD_ORIG}
 Provides:       libavcodec-full = %version-%release
+# This can be required by packages likes vlc-codecs - following the shlib name 
to not get random lib providers
+Provides:       libavcodec56(unrestricted)
 %endif
 
 %description -n libavcodec56
@@ -272,7 +278,7 @@
 
 %prep
 %setup -qn ffmpeg-%version
-%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 -P 6 -P 7 -P 8 -P 9 -P 10 -p1
 
 %build
 perl -i -pe 's{__TIME__|__DATE__}{"$&"}g' *.c

++++++ 0001-avcodec-ansi-Check-dimensions.patch ++++++
>From ab737ab31d4f126ed5a13a6a0498824141925108 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <mich...@niedermayer.cc>
Date: Mon, 26 Sep 2016 20:25:59 +0200
Subject: [PATCH] avcodec/ansi: Check dimensions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: 1.avi

Found-by: 连一汉 <lianyi...@360.cn>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 69449da436169e7facaa6d1f3bcbc41cf6ce2754)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
 libavcodec/ansi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c
index 21d5ae1..98ea9e3 100644
--- a/libavcodec/ansi.c
+++ b/libavcodec/ansi.c
@@ -94,6 +94,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
         int ret = ff_set_dimensions(avctx, 80 << 3, 25 << 4);
         if (ret < 0)
             return ret;
+    } else if (avctx->width % FONT_WIDTH || avctx->height % s->font_height) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid dimensions %d %d\n", 
avctx->width, avctx->height);
+        return AVERROR(EINVAL);
     }
     return 0;
 }
-- 
2.6.6

++++++ 0001-avcodec-cavsdsp-use-av_clip_uint8-for-idct.patch ++++++
>From 69b00a7fb6faa1b19b5687a5762ff4f94d5ff9aa Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <mich...@niedermayer.cc>
Date: Mon, 19 Sep 2016 15:25:38 +0200
Subject: [PATCH] avcodec/cavsdsp: use av_clip_uint8() for idct
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes out of array read
Fixes: 1.swf

Found-by: 连一汉 <lianyi...@360.cn>
Tested-by: 连一汉 <lianyi...@360.cn>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 0e318f110bcd6bb8e7de9127f2747272e60f48d7)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
 libavcodec/cavsdsp.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/libavcodec/cavsdsp.c b/libavcodec/cavsdsp.c
index 91f6d73..df9490a 100644
--- a/libavcodec/cavsdsp.c
+++ b/libavcodec/cavsdsp.c
@@ -188,7 +188,6 @@ static void cavs_filter_ch_c(uint8_t *d, int stride, int 
alpha, int beta, int tc
 static void cavs_idct8_add_c(uint8_t *dst, int16_t *block, int stride) {
     int i;
     int16_t (*src)[8] = (int16_t(*)[8])block;
-    const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
 
     src[0][0] += 8;
 
@@ -243,14 +242,14 @@ static void cavs_idct8_add_c(uint8_t *dst, int16_t 
*block, int stride) {
         const int b2 = a5 - a7;
         const int b3 = a4 - a6;
 
-        dst[i + 0*stride] = cm[ dst[i + 0*stride] + ((b0 + b4) >> 7)];
-        dst[i + 1*stride] = cm[ dst[i + 1*stride] + ((b1 + b5) >> 7)];
-        dst[i + 2*stride] = cm[ dst[i + 2*stride] + ((b2 + b6) >> 7)];
-        dst[i + 3*stride] = cm[ dst[i + 3*stride] + ((b3 + b7) >> 7)];
-        dst[i + 4*stride] = cm[ dst[i + 4*stride] + ((b3 - b7) >> 7)];
-        dst[i + 5*stride] = cm[ dst[i + 5*stride] + ((b2 - b6) >> 7)];
-        dst[i + 6*stride] = cm[ dst[i + 6*stride] + ((b1 - b5) >> 7)];
-        dst[i + 7*stride] = cm[ dst[i + 7*stride] + ((b0 - b4) >> 7)];
+        dst[i + 0*stride] = av_clip_uint8( dst[i + 0*stride] + ((b0 + b4) >> 
7));
+        dst[i + 1*stride] = av_clip_uint8( dst[i + 1*stride] + ((b1 + b5) >> 
7));
+        dst[i + 2*stride] = av_clip_uint8( dst[i + 2*stride] + ((b2 + b6) >> 
7));
+        dst[i + 3*stride] = av_clip_uint8( dst[i + 3*stride] + ((b3 + b7) >> 
7));
+        dst[i + 4*stride] = av_clip_uint8( dst[i + 4*stride] + ((b3 - b7) >> 
7));
+        dst[i + 5*stride] = av_clip_uint8( dst[i + 5*stride] + ((b2 - b6) >> 
7));
+        dst[i + 6*stride] = av_clip_uint8( dst[i + 6*stride] + ((b1 - b5) >> 
7));
+        dst[i + 7*stride] = av_clip_uint8( dst[i + 7*stride] + ((b0 - b4) >> 
7));
     }
 }
 
-- 
2.6.6

++++++ 0001-avformat-avidec-Check-nb_streams-in-read_gab2_sub.patch ++++++
>From 239f75d6c3dfbe4def80a12913d5737dd5a5bbcc Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <mich...@niedermayer.cc>
Date: Wed, 28 Sep 2016 16:14:08 +0200
Subject: [PATCH] avformat/avidec: Check nb_streams in read_gab2_sub()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes null pointer dereference
Fixes: 1/null_point.avi

Found-by: 连一汉 <lianyi...@360.cn>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 2679ad4773aa356e7c3da5c68bc81f02a194617f)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
 libavformat/avidec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 0ffe990..d2904ab 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1090,6 +1090,8 @@ static int read_gab2_sub(AVFormatContext *s, AVStream 
*st, AVPacket *pkt)
             goto error;
 
         if (!avformat_open_input(&ast->sub_ctx, "", sub_demuxer, NULL)) {
+            if (ast->sub_ctx->nb_streams != 1)
+                goto error;
             ff_read_packet(ast->sub_ctx, &ast->sub_pkt);
             *st->codec = *ast->sub_ctx->streams[0]->codec;
             ast->sub_ctx->streams[0]->codec->extradata = NULL;
-- 
2.6.6

++++++ 0001-avformat-avidec-Remove-ancient-assert.patch ++++++
>From a772613100514842008271c8d0e5d63a6979f9bf Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <mich...@niedermayer.cc>
Date: Wed, 28 Sep 2016 15:47:12 +0200
Subject: [PATCH] avformat/avidec: Remove ancient assert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This assert can with crafted files fail, a warning is already printed
for this case.

Fixes assertion failure
Fixes:1/assert.avi

Found-by: 连一汉 <lianyi...@360.cn>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 14bac7e00d72eac687612d9b125e585011a56d4f)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
 libavformat/avidec.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 97dbaef..0ffe990 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1844,7 +1844,6 @@ static int avi_read_seek(AVFormatContext *s, int 
stream_index,
             continue;
 
 //        av_assert1(st2->codec->block_align);
-        av_assert0(fabs(av_q2d(st2->time_base) - ast2->scale / 
(double)ast2->rate) < av_q2d(st2->time_base) * 0.00000001);
         index = av_index_search_timestamp(st2,
                                           av_rescale_q(timestamp,
                                                        st->time_base,
-- 
2.6.6



Reply via email to