Update buildroot 17.02.3 -> 17.02.4
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
From 6cc73bcad19da2cd2e95671173f2e0d203a57e9b Mon Sep 17 00:00:00 2001
|
||||
From: Francois Cartegnie <fcvlcdev@free.fr>
|
||||
Date: Thu, 29 Jun 2017 09:45:20 +0200
|
||||
Subject: [PATCH] codec: avcodec: check avcodec visible sizes
|
||||
|
||||
refs #18467
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
modules/codec/avcodec/video.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
|
||||
index 1bcad21..ce52544 100644
|
||||
--- a/modules/codec/avcodec/video.c
|
||||
+++ b/modules/codec/avcodec/video.c
|
||||
@@ -137,9 +137,11 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec,
|
||||
}
|
||||
|
||||
|
||||
- if( width == 0 || height == 0 || width > 8192 || height > 8192 )
|
||||
+ if( width == 0 || height == 0 || width > 8192 || height > 8192 ||
|
||||
+ width < p_context->width || height < p_context->height )
|
||||
{
|
||||
- msg_Err( p_dec, "Invalid frame size %dx%d.", width, height );
|
||||
+ msg_Err( p_dec, "Invalid frame size %dx%d. vsz %dx%d",
|
||||
+ width, height, p_context->width, p_context->height );
|
||||
return NULL; /* invalid display size */
|
||||
}
|
||||
p_dec->fmt_out.video.i_width = width;
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From a38a85db58c569cc592d9380cc07096757ef3d49 Mon Sep 17 00:00:00 2001
|
||||
From: Francois Cartegnie <fcvlcdev@free.fr>
|
||||
Date: Thu, 29 Jun 2017 11:09:02 +0200
|
||||
Subject: [PATCH] decoder: check visible size when creating buffer
|
||||
|
||||
early reject invalid visible size
|
||||
mishandled by filters.
|
||||
|
||||
refs #18467
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
src/input/decoder.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/input/decoder.c b/src/input/decoder.c
|
||||
index 2c0823f..a216165 100644
|
||||
--- a/src/input/decoder.c
|
||||
+++ b/src/input/decoder.c
|
||||
@@ -2060,7 +2060,9 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
|
||||
vout_thread_t *p_vout;
|
||||
|
||||
if( !p_dec->fmt_out.video.i_width ||
|
||||
- !p_dec->fmt_out.video.i_height )
|
||||
+ !p_dec->fmt_out.video.i_height ||
|
||||
+ p_dec->fmt_out.video.i_width < p_dec->fmt_out.video.i_visible_width ||
|
||||
+ p_dec->fmt_out.video.i_height < p_dec->fmt_out.video.i_visible_height )
|
||||
{
|
||||
/* Can't create a new vout without display size */
|
||||
return NULL;
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,6 +1,2 @@
|
||||
# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.md5
|
||||
md5 7ab63964ffec4c92a54deb018f23318b vlc-2.2.5.1.tar.xz
|
||||
# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.sha1
|
||||
sha1 042962dba68e1414aa563883b0172ee121cf9555 vlc-2.2.5.1.tar.xz
|
||||
# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.sha256
|
||||
sha256 b28b8a28f578c0c6cb1ebed293aca2a3cd368906cf777d1ab599e2784ddda1cc vlc-2.2.5.1.tar.xz
|
||||
# From http://download.videolan.org/pub/videolan/vlc/2.2.6/vlc-2.2.6.tar.xz.sha256
|
||||
sha256 c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8 vlc-2.2.6.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
VLC_VERSION = 2.2.5.1
|
||||
VLC_VERSION = 2.2.6
|
||||
VLC_SITE = http://get.videolan.org/vlc/$(VLC_VERSION)
|
||||
VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
|
||||
VLC_LICENSE = GPLv2+, LGPLv2.1+
|
||||
|
||||
Reference in New Issue
Block a user