summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-04-02 23:59:50 +0200
committerwm4 <wm4@nowhere>2015-04-03 00:12:32 +0200
commit3d17b12d9cfb26975740d2038e848dfe1e302a75 (patch)
tree8628b164141d83579bff2c49f629c382107a02af /video
parent28fa17dac66d29338d24bff217f31d38d494745c (diff)
downloadmpv-3d17b12d9cfb26975740d2038e848dfe1e302a75.tar.bz2
mpv-3d17b12d9cfb26975740d2038e848dfe1e302a75.tar.xz
vo_opengl: remove chroma-location suboption
Terribly obscure, and vf_format can do this for all VOs.
Diffstat (limited to 'video')
-rw-r--r--video/out/gl_video.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index ec8f435b12..94b2e93564 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -418,10 +418,6 @@ const struct m_sub_options gl_video_conf = {
({"fruit", 0}, {"ordered", 1}, {"no", -1})),
OPT_INTRANGE("dither-size-fruit", dither_size, 0, 2, 8),
OPT_FLAG("temporal-dither", temporal_dither, 0),
- OPT_CHOICE("chroma-location", chroma_location, 0,
- ({"auto", MP_CHROMA_AUTO},
- {"center", MP_CHROMA_CENTER},
- {"left", MP_CHROMA_LEFT})),
OPT_CHOICE("alpha", alpha_mode, 0,
({"no", 0},
{"yes", 1},
@@ -612,12 +608,9 @@ static void pass_set_image_textures(struct gl_video *p, struct video_image *vimg
float ls_w = 1.0 / (1 << p->image_desc.chroma_xs);
float ls_h = 1.0 / (1 << p->image_desc.chroma_ys);
- int chroma_loc = p->opts.chroma_location;
- if (!chroma_loc)
- chroma_loc = p->image_params.chroma_location;
- if (chroma_loc != MP_CHROMA_CENTER) {
+ if (p->image_params.chroma_location != MP_CHROMA_CENTER) {
int cx, cy;
- mp_get_chroma_location(chroma_loc, &cx, &cy);
+ mp_get_chroma_location(p->image_params.chroma_location, &cx, &cy);
// By default texture coordinates are such that chroma is centered with
// any chroma subsampling. If a specific direction is given, make it
// so that the luma and chroma sample line up exactly.