diff options
| author | wm4 <wm4@nowhere> | 2015-01-06 15:04:29 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-01-06 16:50:58 +0100 |
| commit | a52ca8a2b075388dc7dd5012e4e3f4871e26b133 (patch) | |
| tree | 8a29d2451c9763d425e37ba6501644a0f3d06bdb /sub | |
| parent | 02362f938f0a782a39e4c069b150650fb4171dc7 (diff) | |
| download | mpv-a52ca8a2b075388dc7dd5012e4e3f4871e26b133.tar.bz2 mpv-a52ca8a2b075388dc7dd5012e4e3f4871e26b133.tar.xz | |
csputils: get rid of mp_csp_details
It used to be central, but now it's just unneeded.
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/draw_bmp.c | 6 | ||||
| -rw-r--r-- | sub/draw_bmp.h | 1 | ||||
| -rw-r--r-- | sub/sd_ass.c | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c index 041e0a70e0..dfbdb340b2 100644 --- a/sub/draw_bmp.c +++ b/sub/draw_bmp.c @@ -289,9 +289,9 @@ static void draw_ass(struct mp_draw_sub_cache *cache, struct mp_rect bb, struct mp_image *temp, int bits, struct sub_bitmaps *sbs) { struct mp_csp_params cspar = MP_CSP_PARAMS_DEFAULTS; - cspar.colorspace.format = temp->params.colorspace; - cspar.colorspace.levels_in = temp->params.colorlevels; - cspar.colorspace.levels_out = MP_CSP_LEVELS_PC; // RGB (libass.color) + cspar.colorspace = temp->params.colorspace; + cspar.levels_in = temp->params.colorlevels; + cspar.levels_out = MP_CSP_LEVELS_PC; // RGB (libass.color) cspar.int_bits_in = bits; cspar.int_bits_out = 8; diff --git a/sub/draw_bmp.h b/sub/draw_bmp.h index 9ccd764d5d..11fbd0daa0 100644 --- a/sub/draw_bmp.h +++ b/sub/draw_bmp.h @@ -5,7 +5,6 @@ struct mp_image; struct sub_bitmaps; -struct mp_csp_details; struct mp_draw_sub_cache; void mp_draw_sub_bitmaps(struct mp_draw_sub_cache **cache, struct mp_image *dst, struct sub_bitmaps *sbs); diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 733f0ffa1d..8f5b02c842 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -396,8 +396,8 @@ static void mangle_colors(struct sd *sd, struct sub_bitmaps *parts) // Conversion that VSFilter would use struct mp_csp_params vs_params = MP_CSP_PARAMS_DEFAULTS; - vs_params.colorspace.format = csp; - vs_params.colorspace.levels_in = levels; + vs_params.colorspace = csp; + vs_params.levels_in = levels; vs_params.int_bits_in = 8; vs_params.int_bits_out = 8; float vs_yuv2rgb[3][4], vs_rgb2yuv[3][4]; @@ -406,8 +406,8 @@ static void mangle_colors(struct sd *sd, struct sub_bitmaps *parts) // Proper conversion to RGB struct mp_csp_params rgb_params = MP_CSP_PARAMS_DEFAULTS; - rgb_params.colorspace.format = params.colorspace; - rgb_params.colorspace.levels_in = params.colorlevels; + rgb_params.colorspace = params.colorspace; + rgb_params.levels_in = params.colorlevels; rgb_params.int_bits_in = 8; rgb_params.int_bits_out = 8; float vs2rgb[3][4]; |