summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authormosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-21 18:25:44 +0000
committermosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-21 18:25:44 +0000
commitefd53eed6148839234feb81b80c40d645811e038 (patch)
tree4f9431be9d36b5f77754464b54f2a29b3779f4d2 /libmpdemux/demux_mkv.c
parent8af443d7d81383d5b767834b9d9ae27a26457b06 (diff)
downloadmpv-efd53eed6148839234feb81b80c40d645811e038.tar.bz2
mpv-efd53eed6148839234feb81b80c40d645811e038.tar.xz
Handle missing palettes in the info part of VobSubs in Matroska files correctly by giving mplayer a NULL pointer. This way it will use a default palette instead of black only. Patch by Csillag Kristof (fenwick () freemail ! hu)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14562 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index f3350789c5..70c9bd9250 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -373,6 +373,7 @@ vobsub_parse_palette (mkv_track_t *t, const char *start)
t->sh_sub.palette[11], t->sh_sub.palette[12],
t->sh_sub.palette[13], t->sh_sub.palette[14],
t->sh_sub.palette[15]);
+ t->sh_sub.has_palette = 1;
return 2;
}
return 0;
@@ -480,6 +481,7 @@ demux_mkv_parse_idx (mkv_track_t *t)
memcpy(buf, t->private_data, t->private_size);
buf[t->private_size] = 0;
t->sh_sub.type = 'v';
+ t->sh_sub.has_palette = 0;
pos = buf;
start = buf;