diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-26 23:52:15 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-26 23:52:15 +0000 |
| commit | 3560751199805441b992c2e4559d10f051764de8 (patch) | |
| tree | ba9bf38c0f993b0001276f6cc33c6441316c4815 /libmpdemux | |
| parent | f2cfee65ccc9ff70086383624ffb75ab75b4e1f3 (diff) | |
| download | mpv-3560751199805441b992c2e4559d10f051764de8.tar.bz2 mpv-3560751199805441b992c2e4559d10f051764de8.tar.xz | |
Simplify init_vobsub: pass palette via extradata.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25873 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mov.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 73348ea084..1ae11f5122 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -564,17 +564,12 @@ unsigned int store_ughvlc(unsigned char *s, unsigned int v){ } static void init_vobsub(sh_sub_t *sh, mov_track_t *trak) { - int i; - uint8_t *pal = trak->stdata; sh->type = 'v'; if (trak->stdata_len < 106) return; - sh->has_palette = 1; - pal += 42; - for (i = 0; i < 16; i++) { - sh->palette[i] = BE_32(pal); - pal += 4; - } + sh->extradata_len = 16*4; + sh->extradata = malloc(sh->extradata_len); + memcpy(sh->extradata, trak->stdata + 42, sh->extradata_len); } static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, |