[vlc-commits] decoder: check visible size on vout fmt update

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jun 29 11:06:16 2017 +0200| [3bda4699760ba56d7e7dc809e98cfd6e3e772527] | committer: Francois Cartegnie

decoder: check visible size on vout fmt update

early reject invalid visible size
mishandled by filters.

refs #18467

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3bda4699760ba56d7e7dc809e98cfd6e3e772527
---

 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 435e78e6b9..dac313737a 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -424,7 +424,9 @@ static int vout_update_format( 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 -1;