Mercurial > mplayer.hg
comparison libmpcodecs/vf_ass.c @ 35574:715e7aa1ffdb
Move some code up.
author | upsuper |
---|---|
date | Wed, 12 Dec 2012 17:13:39 +0000 |
parents | d3b0d3f62d6f |
children | db12239148e9 |
comparison
equal
deleted
inserted
replaced
35573:af20559e55c9 | 35574:715e7aa1ffdb |
---|---|
308 struct mp_eosd_settings res = {0}; | 308 struct mp_eosd_settings res = {0}; |
309 struct dirty_rows_extent *dirty_rows; | 309 struct dirty_rows_extent *dirty_rows; |
310 int outw, outh; | 310 int outw, outh; |
311 int planes, alphas; | 311 int planes, alphas; |
312 int i; | 312 int i; |
313 | |
314 vf->priv->outfmt = outfmt; | |
315 vf->priv->outh = outh = height + ass_top_margin + ass_bottom_margin; | |
316 vf->priv->outw = outw = width; | |
313 | 317 |
314 switch (outfmt) { | 318 switch (outfmt) { |
315 case IMGFMT_YV12: | 319 case IMGFMT_YV12: |
316 case IMGFMT_I420: | 320 case IMGFMT_I420: |
317 case IMGFMT_IYUV: | 321 case IMGFMT_IYUV: |
332 vf->priv->prepare_buffer = prepare_buffer_422; | 336 vf->priv->prepare_buffer = prepare_buffer_422; |
333 break; | 337 break; |
334 default: | 338 default: |
335 return 0; | 339 return 0; |
336 } | 340 } |
337 | |
338 vf->priv->outfmt = outfmt; | |
339 vf->priv->outh = outh = height + ass_top_margin + ass_bottom_margin; | |
340 vf->priv->outw = outw = width; | |
341 | 341 |
342 if (!opt_screen_size_x && !opt_screen_size_y) { | 342 if (!opt_screen_size_x && !opt_screen_size_y) { |
343 d_width = d_width * vf->priv->outw / width; | 343 d_width = d_width * vf->priv->outw / width; |
344 d_height = d_height * vf->priv->outh / height; | 344 d_height = d_height * vf->priv->outh / height; |
345 } | 345 } |