From 0ecd57d4b26500c662c398e3be2cfe316cee2431 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 15 Jul 2013 01:04:49 +0200 Subject: video: unify colorspace setup Guess the colorspace directly in mpcodecs_reconfig_vo(), instead of in set_video_colorspace(). The difference is that the latter function just makes the video filter chain (and VOs) force the detected colorspace, and then throws it away, while the former is a bit more general and central. Not really a big difference and it doesn't matter much in practice, but it guarantees that there is no internal disagreement about the colorspace. --- demux/stheader.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'demux') diff --git a/demux/stheader.h b/demux/stheader.h index c1f606090a..3b9c47ba2c 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -127,9 +127,8 @@ typedef struct sh_video { float aspect; // aspect ratio stored in the file (for prescaling) float stream_aspect; // aspect ratio in media headers (DVD IFO files) int i_bps; // == bitrate (compressed bytes/sec) - int disp_w, disp_h; // display size (filled by demuxer) - int colorspace; // mp_csp - int color_range; // mp_csp_levels + int disp_w, disp_h; // display size (filled by demuxer or decoder) + struct mp_image_params *vf_input; // video filter input params // output driver/filters: (set by libmpcodecs core) struct vf_instance *vfilter; // video filter chain const struct vd_functions *vd_driver; -- cgit v1.2.3