summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-09 06:58:57 +0000
committerulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-09 06:58:57 +0000
commit6e9b19642ac094dd9f927d2e95b2e6a4b039366a (patch)
tree2ffa5b976dd9c018f7504cb0a875f3ed1e64ae39 /libmpdemux/demux_mkv.c
parent486e5b2c2be6ec9e56072284176a86d09f46fdef (diff)
downloadmpv-6e9b19642ac094dd9f927d2e95b2e6a4b039366a.tar.bz2
mpv-6e9b19642ac094dd9f927d2e95b2e6a4b039366a.tar.xz
Convert vobsub custom colors from rgb to yuv using a common function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25326 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index c383872518..00acc803d7 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -356,13 +356,15 @@ vobsub_parse_custom_colors (sh_sub_t *sh, const char *start)
use_custom_colors ? "ON" : "OFF");
if ((start = strstr(start, "colors:")) != NULL)
{
+ unsigned int tmp;
start += 7;
while (isspace(*start))
start++;
for (i = 0; i < 4; i++)
{
- if (sscanf(start, "%06x", &sh->colors[i]) != 1)
+ if (sscanf(start, "%06x", &tmp) != 1)
break;
+ sh->colors[i] = vobsub_rgb_to_yuv(tmp);
start += 6;
while ((*start == ',') || isspace(*start))
start++;