diff options
| author | wm4 <wm4@nowhere> | 2012-10-18 17:31:00 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-24 21:56:33 +0200 |
| commit | 98f74335d509320f19db2da8786273f95cad2a69 (patch) | |
| tree | fe0e36c96a26208ea87464a333ed89d056596ddb /sub/dec_sub.h | |
| parent | d5def80afbdc7d20a22f2f630cdd34c60a0b99a9 (diff) | |
| download | mpv-98f74335d509320f19db2da8786273f95cad2a69.tar.bz2 mpv-98f74335d509320f19db2da8786273f95cad2a69.tar.xz | |
sub: fix text subtitle aspect ratio with vo_xv and vo_lavc, refactor
This fixes that vo_xv didn't display text subtitles correctly when
using anamorphic video. It didn't pass the aspect information to the
subtitle renderer. Also, try to render OSD correctly with respect to
aspect ratio settings: on vo_xv, the OSD is rendered into the video,
and needs to be "stretched" too when playing anamorphic video. When
the -monitorpixelaspect option is used, even with VOs such as vo_opengl
the OSD has to be rendered with that aspect ratio.
As preparation for future commits, replace the weird vsfilter_scale
value with a somewhat more sensible video_par member.
Also, struct mp_eosd_res is a better place for the aspect ratio
parameters, as OSD needs this too.
Use osd_draw_on_image() directly in vo_lavc, which fixes aspect ratio
issues as well.
Diffstat (limited to 'sub/dec_sub.h')
| -rw-r--r-- | sub/dec_sub.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sub/dec_sub.h b/sub/dec_sub.h index 0c5c1ab7ee..389851503e 100644 --- a/sub/dec_sub.h +++ b/sub/dec_sub.h @@ -13,8 +13,6 @@ struct MPOpts *opts; struct sub_render_params { double pts; struct mp_eosd_res dim; - double normal_scale; - double vsfilter_scale; }; static inline bool is_text_sub(int type) |