diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-01 16:18:21 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-01 16:18:21 +0300 |
| commit | 7de350c673e1c0ae52d655e322a072f2f6b624b0 (patch) | |
| tree | 346005084450b679f57c77daad2263fcdcf9e1de /libmpdemux/demux_mov.c | |
| parent | 28fbfd2cdea5ffa860a251de274a74b0e85c88f0 (diff) | |
| parent | 3ff9a6e7d82ff9a5231e561bd2686fab7df97f68 (diff) | |
| download | mpv-7de350c673e1c0ae52d655e322a072f2f6b624b0.tar.bz2 mpv-7de350c673e1c0ae52d655e322a072f2f6b624b0.tar.xz | |
Merge svn changes up to r27184
Diffstat (limited to 'libmpdemux/demux_mov.c')
| -rw-r--r-- | libmpdemux/demux_mov.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index edfe7cd221..37de8b9558 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -928,10 +928,6 @@ static int gen_sh_video(sh_video_t* sh, mov_track_t* trak, int timescale) { int hdr_ptr = 76; // the byte just after depth unsigned char *palette_map; - depth = trak->stdata[75] | (trak->stdata[74] << 8); - if (trak->fourcc == mmioFOURCC('r', 'a', 'w', ' ')) { - sh->format = IMGFMT_RGB | depth; - } else sh->format=trak->fourcc; // crude video delay from editlist0 hack ::atm @@ -949,6 +945,11 @@ static int gen_sh_video(sh_video_t* sh, mov_track_t* trak, int timescale) { trak->stdata_len); return 0; } + + depth = trak->stdata[75] | (trak->stdata[74] << 8); + if (trak->fourcc == mmioFOURCC('r', 'a', 'w', ' ')) + sh->format = IMGFMT_RGB | depth; + // stdata[]: // 8 short version // 10 short revision |