[vlc-commits] transcode: use video.i_width/height as fallback when setting visible_width /height

Ilkka Ollakka git at videolan.org
Sat Nov 9 18:02:36 CET 2013


vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sat Nov  9 19:01:38 2013 +0200| [0ed2f1ea469dd0d64d4842c19020a8f1bd6c99b1] | committer: Ilkka Ollakka

transcode: use video.i_width/height as fallback when setting visible_width/height

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

 modules/stream_out/transcode/video.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 5f277a9..aa901d0 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -197,12 +197,12 @@ int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
         id->p_encoder->fmt_out.video.i_visible_width
           ? id->p_encoder->fmt_out.video.i_visible_width
           : id->p_decoder->fmt_in.video.i_visible_width
-            ? id->p_decoder->fmt_in.video.i_visible_width : 16;
+            ? id->p_decoder->fmt_in.video.i_visible_width : id->p_encoder->fmt_in.video.i_width;
     id->p_encoder->fmt_in.video.i_visible_height =
         id->p_encoder->fmt_out.video.i_visible_height
           ? id->p_encoder->fmt_out.video.i_visible_height
           : id->p_decoder->fmt_in.video.i_visible_height
-            ? id->p_decoder->fmt_in.video.i_visible_height : 16;
+            ? id->p_decoder->fmt_in.video.i_visible_height : id->p_encoder->fmt_in.video.i_height;
     id->p_encoder->fmt_in.video.i_frame_rate = ENC_FRAMERATE;
     id->p_encoder->fmt_in.video.i_frame_rate_base = ENC_FRAMERATE_BASE;
 



More information about the vlc-commits mailing list