Mercurial > mplayer.hg
annotate libmpcodecs/vd.c @ 6547:1c282256162a
it's bug not vbug...
author | jonas |
---|---|
date | Mon, 24 Jun 2002 11:03:04 +0000 |
parents | f0788e0f7475 |
children | 522713337297 |
rev | line source |
---|---|
4878 | 1 #include <stdio.h> |
2 #include <stdlib.h> | |
3 #include <string.h> | |
4 | |
5 #include "config.h" | |
6 #include "mp_msg.h" | |
5075 | 7 #include "help_mp.h" |
4878 | 8 |
9 #ifdef HAVE_MALLOC_H | |
10 #include <malloc.h> | |
11 #endif | |
12 | |
13 #include "codec-cfg.h" | |
14 //#include "mp_image.h" | |
15 | |
5607 | 16 #include "img_format.h" |
4878 | 17 |
18 #include "stream.h" | |
19 #include "demuxer.h" | |
20 #include "stheader.h" | |
6057
31e465fda59c
various openbsd and general warning fixes - patch by Bj«Órn Sandell <biorn@dce.chalmers.se>
arpi
parents:
5925
diff
changeset
|
21 #include "dec_video.h" |
4878 | 22 |
23 #include "vd.h" | |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
24 #include "vf.h" |
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
25 |
4878 | 26 //#include "vd_internal.h" |
27 | |
28 extern vd_functions_t mpcodecs_vd_null; | |
4885 | 29 extern vd_functions_t mpcodecs_vd_cinepak; |
4915
f6990fad0ab3
Qt RPZA decoder interface by Roberto Togni <rtogni@bresciaonline.it>
arpi
parents:
4899
diff
changeset
|
30 extern vd_functions_t mpcodecs_vd_qtrpza; |
4951 | 31 extern vd_functions_t mpcodecs_vd_ffmpeg; |
4958 | 32 extern vd_functions_t mpcodecs_vd_dshow; |
4968 | 33 extern vd_functions_t mpcodecs_vd_vfw; |
34 extern vd_functions_t mpcodecs_vd_vfwex; | |
35 extern vd_functions_t mpcodecs_vd_odivx; | |
36 extern vd_functions_t mpcodecs_vd_divx4; | |
4969 | 37 extern vd_functions_t mpcodecs_vd_raw; |
38 extern vd_functions_t mpcodecs_vd_xanim; | |
5193
abea2deab4d6
MPlayer now has a Microsoft RLE decoder to call its own...only supports
melanson
parents:
5180
diff
changeset
|
39 extern vd_functions_t mpcodecs_vd_msrle; |
4987 | 40 extern vd_functions_t mpcodecs_vd_msvidc; |
41 extern vd_functions_t mpcodecs_vd_fli; | |
4989 | 42 extern vd_functions_t mpcodecs_vd_qtrle; |
43 extern vd_functions_t mpcodecs_vd_qtsmc; | |
44 extern vd_functions_t mpcodecs_vd_roqvideo; | |
45 extern vd_functions_t mpcodecs_vd_cyuv; | |
46 extern vd_functions_t mpcodecs_vd_nuv; | |
4998 | 47 extern vd_functions_t mpcodecs_vd_mpng; |
5029 | 48 extern vd_functions_t mpcodecs_vd_ijpg; |
4998 | 49 extern vd_functions_t mpcodecs_vd_libmpeg2; |
5235
3e04fd1074d3
added HuffYUV support, courtesy of Roberto Togni <rtogni@bresciaonline.it>
melanson
parents:
5224
diff
changeset
|
50 extern vd_functions_t mpcodecs_vd_huffyuv; |
5264 | 51 extern vd_functions_t mpcodecs_vd_zlib; |
5476 | 52 extern vd_functions_t mpcodecs_vd_mpegpes; |
6343
d253cf4f43a9
realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6234
diff
changeset
|
53 extern vd_functions_t mpcodecs_vd_real; |
6506 | 54 extern vd_functions_t mpcodecs_vd_svq1; |
4878 | 55 |
56 vd_functions_t* mpcodecs_vd_drivers[] = { | |
57 &mpcodecs_vd_null, | |
4884 | 58 &mpcodecs_vd_cinepak, |
4915
f6990fad0ab3
Qt RPZA decoder interface by Roberto Togni <rtogni@bresciaonline.it>
arpi
parents:
4899
diff
changeset
|
59 &mpcodecs_vd_qtrpza, |
4951 | 60 #ifdef USE_LIBAVCODEC |
61 &mpcodecs_vd_ffmpeg, | |
62 #endif | |
4968 | 63 #ifdef USE_WIN32DLL |
4958 | 64 #ifdef USE_DIRECTSHOW |
65 &mpcodecs_vd_dshow, | |
66 #endif | |
4968 | 67 &mpcodecs_vd_vfw, |
68 &mpcodecs_vd_vfwex, | |
69 #endif | |
70 #ifdef USE_DIVX | |
71 &mpcodecs_vd_odivx, | |
72 #ifdef NEW_DECORE | |
73 &mpcodecs_vd_divx4, | |
74 #endif | |
75 #endif | |
4969 | 76 &mpcodecs_vd_raw, |
5193
abea2deab4d6
MPlayer now has a Microsoft RLE decoder to call its own...only supports
melanson
parents:
5180
diff
changeset
|
77 &mpcodecs_vd_msrle, |
4987 | 78 &mpcodecs_vd_msvidc, |
79 &mpcodecs_vd_fli, | |
4989 | 80 &mpcodecs_vd_qtrle, |
81 &mpcodecs_vd_qtsmc, | |
82 &mpcodecs_vd_roqvideo, | |
83 &mpcodecs_vd_cyuv, | |
84 &mpcodecs_vd_nuv, | |
4969 | 85 #ifdef USE_XANIM |
86 &mpcodecs_vd_xanim, | |
87 #endif | |
4998 | 88 #ifdef HAVE_PNG |
89 &mpcodecs_vd_mpng, | |
90 #endif | |
5029 | 91 #ifdef HAVE_JPEG |
92 &mpcodecs_vd_ijpg, | |
93 #endif | |
4998 | 94 &mpcodecs_vd_libmpeg2, |
5235
3e04fd1074d3
added HuffYUV support, courtesy of Roberto Togni <rtogni@bresciaonline.it>
melanson
parents:
5224
diff
changeset
|
95 &mpcodecs_vd_huffyuv, |
5264 | 96 #ifdef HAVE_ZLIB |
97 &mpcodecs_vd_zlib, | |
98 #endif | |
5476 | 99 &mpcodecs_vd_mpegpes, |
6343
d253cf4f43a9
realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6234
diff
changeset
|
100 #ifdef USE_REALCODECS |
d253cf4f43a9
realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6234
diff
changeset
|
101 &mpcodecs_vd_real, |
d253cf4f43a9
realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6234
diff
changeset
|
102 #endif |
6506 | 103 &mpcodecs_vd_svq1, |
4878 | 104 NULL |
105 }; | |
106 | |
4971 | 107 #include "libvo/video_out.h" |
108 | |
5075 | 109 // libvo opts: |
110 int fullscreen=0; | |
111 int vidmode=0; | |
112 int softzoom=0; | |
113 int flip=-1; | |
114 int opt_screen_size_x=0; | |
115 int opt_screen_size_y=0; | |
116 int screen_size_xy=0; | |
117 float movie_aspect=-1.0; | |
118 int vo_flags=0; | |
5483 | 119 int vd_use_slices=1; |
5075 | 120 |
5180 | 121 extern vd_functions_t* mpvdec; // FIXME! |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
122 extern int divx_quality; |
5180 | 123 |
4878 | 124 int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt){ |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
125 int i,j; |
5075 | 126 unsigned int out_fmt=0; |
127 int screen_size_x=0;//SCREEN_SIZE_X; | |
128 int screen_size_y=0;//SCREEN_SIZE_Y; | |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
129 // vo_functions_t* video_out=sh->video_out; |
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
130 vf_instance_t* vf=sh->vfilter; |
5075 | 131 |
5365
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
132 #if 1 |
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
133 if(!(sh->disp_w && sh->disp_h)) |
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
134 mp_msg(MSGT_DECVIDEO,MSGL_WARN, |
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
135 "VDec: codec didn't set sh->disp_w and sh->disp_h, trying to workaround!\n"); |
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
136 /* XXX: HACK, if sh->disp_* aren't set, |
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
137 * but we have w and h, set them :: atmos */ |
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
138 if(!sh->disp_w && w) |
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
139 sh->disp_w=w; |
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
140 if(!sh->disp_h && h) |
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
141 sh->disp_h=h; |
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
142 #endif |
b87743434e1f
Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.
atmos4
parents:
5315
diff
changeset
|
143 |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
6057
diff
changeset
|
144 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDec: vo config request - %d x %d (preferred csp: %s) \n", |
5004 | 145 w,h,vo_format_name(preferred_outfmt)); |
5075 | 146 |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
147 // if(!vf) return 1; // temp hack |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
148 |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
149 if(get_video_quality_max(sh)<=0 && divx_quality){ |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
150 // user wants postprocess but no pp filter yet: |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
151 sh->vfilter=vf=vf_open_filter(vf,"pp",NULL); |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
152 } |
5077 | 153 |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
154 // check if libvo and codec has common outfmt (no conversion): |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
155 csp_again: |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
156 j=-1; |
5075 | 157 for(i=0;i<CODECS_MAX_OUTFMT;i++){ |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
158 int flags; |
5075 | 159 out_fmt=sh->codec->outfmt[i]; |
160 if(out_fmt==(signed int)0xFFFFFFFF) continue; | |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
161 flags=vf->query_format(vf,out_fmt); |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
162 mp_msg(MSGT_CPLAYER,MSGL_V,"vo_debug: query(%s) returned 0x%X (i=%d) \n",vo_format_name(out_fmt),flags,i); |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
163 if((flags&2) || (flags && j<0)){ |
5180 | 164 // check (query) if codec really support this outfmt... |
165 if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==CONTROL_FALSE) | |
166 continue; | |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
167 j=i; vo_flags=flags; if(flags&2) break; |
5180 | 168 } |
5075 | 169 } |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
170 if(j<0){ |
5075 | 171 // TODO: no match - we should use conversion... |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
172 if(strcmp(vf->info->name,"scale")){ |
5710 | 173 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Couldn't find matching colorspace - retrying with -vop scale...\n"); |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
174 vf=vf_open_filter(vf,"scale",NULL); |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
175 goto csp_again; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
176 } |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
177 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_VOincompCodec); |
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
178 sh->vf_inited=-1; |
5075 | 179 return 0; // failed |
180 } | |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
181 out_fmt=sh->codec->outfmt[j]; |
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
182 sh->outfmtidx=j; |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
183 sh->vfilter=vf; |
5075 | 184 |
185 // autodetect flipping | |
186 if(flip==-1){ | |
187 flip=0; | |
5131
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
188 if(sh->codec->outflags[j]&CODECS_FLAG_FLIP) |
cff03e88d331
prefer outfmt with no conversion (see vo's query flags)
arpi
parents:
5077
diff
changeset
|
189 if(!(sh->codec->outflags[j]&CODECS_FLAG_NOFLIP)) |
5075 | 190 flip=1; |
191 } | |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
192 if(vo_flags&VFCAP_FLIPPED) flip^=1; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
193 if(flip && !(vo_flags&VFCAP_FLIP)){ |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
194 // we need to flip, but no flipping filter avail. |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
195 sh->vfilter=vf=vf_open_filter(vf,"flip",NULL); |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5549
diff
changeset
|
196 } |
5075 | 197 |
198 // time to do aspect ratio corrections... | |
199 | |
200 if(movie_aspect>-1.0) sh->aspect = movie_aspect; // cmdline overrides autodetect | |
201 // if(!sh->aspect) sh->aspect=1.0; | |
5903 | 202 |
203 if(opt_screen_size_x||opt_screen_size_y){ | |
204 screen_size_x = opt_screen_size_x; | |
205 screen_size_y = opt_screen_size_y; | |
206 if(!vidmode){ | |
5075 | 207 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X; |
208 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y; | |
209 if(screen_size_x<=8) screen_size_x*=sh->disp_w; | |
210 if(screen_size_y<=8) screen_size_y*=sh->disp_h; | |
5903 | 211 } |
5075 | 212 } else { |
213 // check source format aspect, calculate prescale ::atmos | |
214 screen_size_x=sh->disp_w; | |
215 screen_size_y=sh->disp_h; | |
5903 | 216 if(screen_size_xy>0){ |
217 if(screen_size_xy<=8){ | |
218 // -xy means x+y scale | |
219 screen_size_x*=screen_size_xy; | |
220 screen_size_y*=screen_size_xy; | |
221 } else { | |
222 // -xy means forced width while keeping correct aspect | |
223 screen_size_x=screen_size_xy; | |
224 screen_size_y=screen_size_xy*sh->disp_h/sh->disp_w; | |
225 } | |
226 } | |
5075 | 227 if(sh->aspect>0.01){ |
5903 | 228 int w; |
5075 | 229 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is %.2f:1 - prescaling to correct movie aspect.\n", |
230 sh->aspect); | |
5903 | 231 w=(int)((float)screen_size_y*sh->aspect); w+=w%2; // round |
232 // we don't like horizontal downscale || user forced width: | |
233 if(w<screen_size_x || screen_size_xy>8){ | |
234 screen_size_y=(int)((float)screen_size_x*(1.0/sh->aspect)); | |
5075 | 235 screen_size_y+=screen_size_y%2; // round |
5903 | 236 } else screen_size_x=w; // keep new width |
5075 | 237 } else { |
238 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is undefined - no prescaling applied.\n"); | |
239 } | |
240 } | |
241 | |
242 // Time to config libvo! | |
243 mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", | |
244 sh->disp_w,sh->disp_h, | |
245 screen_size_x,screen_size_y, | |
246 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), | |
247 "MPlayer",out_fmt); | |
248 | |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
249 // memset(&vtune,0,sizeof(vo_tune_info_t)); |
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
250 if(vf->config(vf,sh->disp_w,sh->disp_h, |
5075 | 251 screen_size_x,screen_size_y, |
252 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3), | |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
253 out_fmt)==0){ |
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5483
diff
changeset
|
254 // "MPlayer",out_fmt,&vtune)){ |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
255 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_CannotInitVO); |
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
256 sh->vf_inited=-1; |
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
257 return 0; |
5075 | 258 } |
259 | |
5925
3f17793b2cea
setting vf_inited flag, some printf->mp_msg, some MSGL_FATAL->MSGL_WARN
arpi
parents:
5903
diff
changeset
|
260 sh->vf_inited=1; |
4878 | 261 return 1; |
262 } | |
263 | |
264 // mp_imgtype: buffering type, see mp_image.h | |
265 // mp_imgflag: buffer requirements (read/write, preserve, stride limits), see mp_image.h | |
266 // returns NULL or allocated mp_image_t* | |
267 // Note: buffer allocation may be moved to mpcodecs_config_vo() later... | |
268 mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h){ | |
6234
af0b011c9440
setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents:
6138
diff
changeset
|
269 mp_image_t* mpi=vf_get_image(sh->vfilter,sh->codec->outfmt[sh->outfmtidx],mp_imgtype,mp_imgflag,w,h); |
af0b011c9440
setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents:
6138
diff
changeset
|
270 mpi->x=mpi->y=0; |
af0b011c9440
setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents:
6138
diff
changeset
|
271 mpi->w=sh->disp_w; |
af0b011c9440
setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents:
6138
diff
changeset
|
272 mpi->h=sh->disp_h; |
af0b011c9440
setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0
arpi
parents:
6138
diff
changeset
|
273 return mpi; |
4878 | 274 } |
275 |