summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-12 21:17:38 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-12 21:17:38 +0000
commit14c5e64fd915dc0cdd3656dec3711ff820b14e2e (patch)
tree50695be7b6fd443d03e780de84449a37925d1263 /libvo
parentb635519bbf52d87ce304a3f509fd3f11b2ab8d31 (diff)
downloadmpv-14c5e64fd915dc0cdd3656dec3711ff820b14e2e.tar.bz2
mpv-14c5e64fd915dc0cdd3656dec3711ff820b14e2e.tar.xz
Support SMPTE-240M colourspace in vo_vdpau.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29771 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_vdpau.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 40bc9a70b8..daf442be2d 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -410,8 +410,8 @@ static int update_csc_matrix(void)
VdpCSCMatrix matrix;
static const VdpVideoMixerAttribute attributes[] = {VDP_VIDEO_MIXER_ATTRIBUTE_CSC_MATRIX};
const void *attribute_values[] = {&matrix};
- static const VdpColorStandard vdp_colors[] = {0, VDP_COLOR_STANDARD_ITUR_BT_601, VDP_COLOR_STANDARD_ITUR_BT_709};
- static const char * const vdp_names[] = {NULL, "BT.601", "BT.709"};
+ static const VdpColorStandard vdp_colors[] = {0, VDP_COLOR_STANDARD_ITUR_BT_601, VDP_COLOR_STANDARD_ITUR_BT_709, VDP_COLOR_STANDARD_SMPTE_240M};
+ static const char * const vdp_names[] = {NULL, "BT.601", "BT.709", "SMPTE-240M"};
int csp = colorspace;
if (!csp)
@@ -1094,6 +1094,7 @@ static const char help_msg[] =
" 0: guess based on video resolution\n"
" 1: ITU-R BT.601 (default)\n"
" 2: ITU-R BT.709\n"
+ " 3: SMPTE-240M\n"
;
static int preinit(const char *arg)
@@ -1120,7 +1121,7 @@ static int preinit(const char *arg)
deint_type = deint;
if (deint > 1)
deint_buffer_past_frames = 1;
- if (colorspace < 0 || colorspace > 2) {
+ if (colorspace < 0 || colorspace > 3) {
mp_msg(MSGT_VO, MSGL_WARN, "[vdpau] Invalid color space specified, "
"using BT.601\n");
colorspace = 1;