Mercurial > mplayer.hg

changeset 20671:66f2db668910

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Always respect w and h params to mpcodecs_config_vo over sh->disp_w and sh->disp_h, otherwise it will break when the resolution changes mid-stream, like in http://samples.mplayerhq.hu/MPEG2/res_change_ffmpeg_aspect.ts
author reimar
date Sun, 05 Nov 2006 12:10:44 +0000
parents 79b91e734320
children 12f335a0bc7a
files libmpcodecs/vd.c
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vd.c	Sun Nov 05 11:54:29 2006 +0000
+++ b/libmpcodecs/vd.c	Sun Nov 05 12:10:44 2006 +0000
@@ -140,13 +140,9 @@
     int palette=0;
     int vocfg_flags=0;
 
-    if(!sh->disp_w || !sh->disp_h)
-        mp_msg(MSGT_DECVIDEO,MSGL_WARN, MSGTR_CodecDidNotSet);
-    /* XXX: HACK, if sh->disp_* aren't set,
-     * but we have w and h, set them :: atmos */
-    if(!sh->disp_w && w)
+    if(w)
         sh->disp_w=w;
-    if(!sh->disp_h && h)
+    if(h)
         sh->disp_h=h;
 
     if(!sh->disp_w || !sh->disp_h)