summaryrefslogtreecommitdiffstats
path: root/sub/sd_ass.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-02 23:01:37 +0200
committerwm4 <wm4@nowhere>2013-06-03 22:40:07 +0200
commit5d517184f5c294e6aba8e2d729fad7caa5db75b4 (patch)
tree9276de5097cc033de749c9fae5e670a1155ad4d4 /sub/sd_ass.c
parent3913e3e383f2838c19c876ff1d809ac883014760 (diff)
downloadmpv-5d517184f5c294e6aba8e2d729fad7caa5db75b4.tar.bz2
mpv-5d517184f5c294e6aba8e2d729fad7caa5db75b4.tar.xz
sub: never set VSFilter aspect if the ASS subtitle is converted
When e.g. converting SRT to ASS, we certainly don't want them stretched by video aspect ratio, even if that's necessary for native ASS subtitles. Annoying weird details...
Diffstat (limited to 'sub/sd_ass.c')
-rw-r--r--sub/sd_ass.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 7e863a2844..1f7f33b026 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -67,6 +67,7 @@ static int init(struct sd *sd)
return -1;
bool ass = is_native_ass(sd->codec);
+ bool is_converted = sd->converted_from != NULL;
struct sd_ass_priv *ctx = talloc_zero(NULL, struct sd_ass_priv);
sd->priv = ctx;
if (sd->ass_track) {
@@ -81,7 +82,7 @@ static int init(struct sd *sd)
sd->extradata_len);
}
- ctx->vsfilter_aspect = ass;
+ ctx->vsfilter_aspect = !is_converted;
return 0;
}