diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-20 18:15:08 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-20 18:15:08 +0100 |
| commit | 8700700de8a4103724796077034f7f254ad974bc (patch) | |
| tree | 2fce4dee518a202c45c3f16567db36edc92ed914 /video/csputils.h | |
| parent | e6b85c91700bee0ddc92e98a30d5021691bd6f65 (diff) | |
| parent | eafc273d2c2ae6d247d741202e58ca23dc938cb2 (diff) | |
| download | mpv-8700700de8a4103724796077034f7f254ad974bc.tar.bz2 mpv-8700700de8a4103724796077034f7f254ad974bc.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'video/csputils.h')
| -rw-r--r-- | video/csputils.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/video/csputils.h b/video/csputils.h index 0406ddf35f..9eaafbe75d 100644 --- a/video/csputils.h +++ b/video/csputils.h @@ -125,6 +125,9 @@ struct mp_colorspace { float sig_peak; // signal peak, highest value that occurs in the source }; +// Replaces unknown values in the first struct by those of the second struct +void mp_colorspace_merge(struct mp_colorspace *orig, struct mp_colorspace *new); + struct mp_csp_params { struct mp_colorspace color; // input colorspace enum mp_csp_levels levels_out; // output device |