diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-07-10 01:06:17 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-07-10 01:06:17 +0200 |
| commit | 76354385929b76b02b8c32a7b1cd4d669a8f2e0a (patch) | |
| tree | 738a432ac5648098cf93101bf64a010cff47486a /video/filter/vf_format.c | |
| parent | 69e7b0d3ea4b75a8040ede5b9b7e6fa93ec68056 (diff) | |
| parent | e518bf2c72fc862fbe1de1c98313a03fa0db2e98 (diff) | |
| download | mpv-76354385929b76b02b8c32a7b1cd4d669a8f2e0a.tar.bz2 mpv-76354385929b76b02b8c32a7b1cd4d669a8f2e0a.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'video/filter/vf_format.c')
| -rw-r--r-- | video/filter/vf_format.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c index 109fda4053..d406d98d9b 100644 --- a/video/filter/vf_format.c +++ b/video/filter/vf_format.c @@ -88,15 +88,15 @@ static int reconfig(struct vf_instance *vf, struct mp_image_params *in, if (p->outfmt) out->imgfmt = p->outfmt; if (p->colormatrix) - out->colorspace = p->colormatrix; + out->color.space = p->colormatrix; if (p->colorlevels) - out->colorlevels = p->colorlevels; + out->color.levels = p->colorlevels; if (p->primaries) - out->primaries = p->primaries; + out->color.primaries = p->primaries; if (p->gamma) - out->gamma = p->gamma; + out->color.gamma = p->gamma; if (p->peak) - out->peak = p->peak; + out->color.sig_peak = p->peak; if (p->chroma_location) out->chroma_location = p->chroma_location; if (p->stereo_in) |