summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-24 13:07:49 +0100
committerwm4 <wm4@nowhere>2013-11-24 14:44:58 +0100
commit4012c4a96ee1786bb0d17bd2a3368d20fbb870c9 (patch)
treedc5e2929739597189ff7cfe85bd6d5ec2b712d07 /sub
parente5311586ab7641e0e1936473594bd9fbaa67bb2d (diff)
downloadmpv-4012c4a96ee1786bb0d17bd2a3368d20fbb870c9.tar.bz2
mpv-4012c4a96ee1786bb0d17bd2a3368d20fbb870c9.tar.xz
osd: remove mp_osd_res.video_par field
This is not needed anymore, because we decided that the PAR of the decoded video matters, and not the PAR of the filtered video that arrives at the VO.
Diffstat (limited to 'sub')
-rw-r--r--sub/osd.c3
-rw-r--r--sub/osd.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/sub/osd.c b/sub/osd.c
index 4c1b2ff322..11bf50d8d9 100644
--- a/sub/osd.c
+++ b/sub/osd.c
@@ -76,8 +76,7 @@ static bool osd_res_equals(struct mp_osd_res a, struct mp_osd_res b)
{
return a.w == b.w && a.h == b.h && a.ml == b.ml && a.mt == b.mt
&& a.mr == b.mr && a.mb == b.mb
- && a.display_par == b.display_par
- && a.video_par == b.video_par;
+ && a.display_par == b.display_par;
}
struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib)
diff --git a/sub/osd.h b/sub/osd.h
index 64e10193ea..cdd681b339 100644
--- a/sub/osd.h
+++ b/sub/osd.h
@@ -80,7 +80,6 @@ struct mp_osd_res {
int w, h; // screen dimensions, including black borders
int mt, mb, ml, mr; // borders (top, bottom, left, right)
double display_par;
- double video_par; // PAR of the original video (for some sub decoders)
};
enum mp_osdtype {