Mercurial > mplayer.hg

comparison libmpcodecs/vd.c @ 5365:b87743434e1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround. Fix ijpg codec to set sh->disp_w and sh->disp_h.
author atmos4
date Wed, 27 Mar 2002 02:58:55 +0000
parents 75092614a37d
children ac09ea252466
comparison
equal deleted inserted replaced
5364:4a743a02eb57 5365:b87743434e1f
120 int i,j; 120 int i,j;
121 unsigned int out_fmt=0; 121 unsigned int out_fmt=0;
122 int screen_size_x=0;//SCREEN_SIZE_X; 122 int screen_size_x=0;//SCREEN_SIZE_X;
123 int screen_size_y=0;//SCREEN_SIZE_Y; 123 int screen_size_y=0;//SCREEN_SIZE_Y;
124 vo_functions_t* video_out=sh->video_out; 124 vo_functions_t* video_out=sh->video_out;
125
126 #if 1
127 if(!(sh->disp_w && sh->disp_h))
128 mp_msg(MSGT_DECVIDEO,MSGL_WARN,
129 "VDec: codec didn't set sh->disp_w and sh->disp_h, trying to workaround!\n");
130 /* XXX: HACK, if sh->disp_* aren't set,
131 * but we have w and h, set them :: atmos */
132 if(!sh->disp_w && w)
133 sh->disp_w=w;
134 if(!sh->disp_h && h)
135 sh->disp_h=h;
136 #endif
125 137
126 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDec: vo config request - %d x %d, %s \n", 138 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDec: vo config request - %d x %d, %s \n",
127 w,h,vo_format_name(preferred_outfmt)); 139 w,h,vo_format_name(preferred_outfmt));
128 140
129 if(!video_out) return 1; // temp hack 141 if(!video_out) return 1; // temp hack