summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-10-28 04:12:18 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-10-28 04:12:18 +0200
commit479f5e742f22d46430fa265adfa9162f4e2ab865 (patch)
tree8450cfd34feb5b81d604101ad9ebfc7b24c1d88e /mencoder.c
parent0d7f9f033cdd677df3b85aca45491955b87a1abc (diff)
parent97293969b40797442ec0f612b89a89ace8804561 (diff)
downloadmpv-479f5e742f22d46430fa265adfa9162f4e2ab865.tar.bz2
mpv-479f5e742f22d46430fa265adfa9162f4e2ab865.tar.xz
Merge svn changes up to r27841
Conflicts: mplayer.c
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/mencoder.c b/mencoder.c
index 46370bc85c..e578509450 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -739,19 +739,16 @@ else {
if (spudec_ifo) {
unsigned int palette[16], width, height;
if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0)
- vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h);
+ vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h, NULL, 0);
}
#ifdef CONFIG_DVDREAD
if (vo_spudec==NULL) {
vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL,
- sh_video->disp_w, sh_video->disp_h);
+ sh_video->disp_w, sh_video->disp_h, NULL, 0);
}
#endif
}
-// Apply current settings for forced subs
-spudec_set_forced_subs_only(vo_spudec,forced_subs_only);
-
ostream = open_output_stream(out_filename, 0);
if(!ostream) {
mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_CannotOpenOutputFile, out_filename);