[MPlayer-cvslog] r20687 - trunk/libmpcodecs/vd.c

[reimar]

Author: reimar
Date: Sun Nov  5 13:10:44 2006
New Revision: 20687

Modified:
   trunk/libmpcodecs/vd.c

Log:
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


Modified: trunk/libmpcodecs/vd.c
==============================================================================
--- trunk/libmpcodecs/vd.c	(original)
+++ trunk/libmpcodecs/vd.c	Sun Nov  5 13:10:44 2006
@@ -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)