[vlc-commits] src/image: make sure we set the output dimensions correctly (refs #13862)

[Felix Paul Kühne]

vlc/vlc-2.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Jun 23 18:18:53 2015 +0200| [1568af3af62f7513bf63336ad8d7853ce9b62e24] | committer: Felix Paul Kühne

src/image: make sure we set the output dimensions correctly (refs #13862)

Previously, if the user set a custom size in the options, it wasn't respected but the snapshot was stored at the native video size

(cherry picked from commit 903b3cbcbc3bf4eab01c80e15e91f2cca0bbeb5e)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=1568af3af62f7513bf63336ad8d7853ce9b62e24
---

 src/misc/image.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/misc/image.c b/src/misc/image.c
index 247b681..0f25609 100644
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -711,7 +711,9 @@ static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in,
     p_enc->fmt_in.video = *fmt_in;
 
     if( p_enc->fmt_in.video.i_visible_width == 0 ||
-        p_enc->fmt_in.video.i_visible_height == 0 )
+        p_enc->fmt_in.video.i_visible_height == 0 ||
+        p_enc->fmt_out.video.i_visible_width == 0 ||
+        p_enc->fmt_out.video.i_visible_height == 0 )
     {
         if( fmt_out->i_width > 0 && fmt_out->i_height > 0 )
         {