diff options
| author | rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-14 22:40:35 +0000 |
|---|---|---|
| committer | rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-14 22:40:35 +0000 |
| commit | 88990e297ce30f151bc76b8d06981c5cd17aee97 (patch) | |
| tree | d55dad0b28e9dd1e4dac3ae981fe7a976b782464 /libmpdemux/demux_mkv.c | |
| parent | 4254e10d2a8f1388010dd727e651948823dac634 (diff) | |
| download | mpv-88990e297ce30f151bc76b8d06981c5cd17aee97.tar.bz2 mpv-88990e297ce30f151bc76b8d06981c5cd17aee97.tar.xz | |
Fix extradata passing to lavc RV20 decoder
Pass video codec extradata unchanged from demux_real, sync vd_realvid to
the new format
Sync mkv demuxer to the changes above (cmsg24 extradata was totally
broken before)
Detect cmsg24 size from extradata (was fixed)
Based on a patch by elupus >> elupus >a< ecce se <<
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20936 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index a72387253b..acbba13ce3 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1869,12 +1869,14 @@ demux_mkv_open_video (demuxer_t *demuxer, mkv_track_t *track, int vid) unsigned char *dst, *src; real_video_props_t *rvp; uint32_t type2; + unsigned int cnt; rvp = (real_video_props_t *) track->private_data; src = (unsigned char *) (rvp + 1); - bih = realloc(bih, sizeof (BITMAPINFOHEADER)+12); - bih->biSize = 48; + cnt = track->private_size - sizeof (real_video_props_t); + bih = realloc(bih, sizeof (BITMAPINFOHEADER)+8+cnt); + bih->biSize = 48+cnt; bih->biPlanes = 1; type2 = be2me_32 (rvp->type2); if (type2 == 0x10003000 || type2 == 0x10003001) @@ -1882,17 +1884,9 @@ demux_mkv_open_video (demuxer_t *demuxer, mkv_track_t *track, int vid) else bih->biCompression=mmioFOURCC('R','V',track->codec_id[9],'0'); dst = (unsigned char *) (bih + 1); - ((unsigned int *) dst)[0] = be2me_32 (rvp->type1); - ((unsigned int *) dst)[1] = type2; - - if (bih->biCompression <= 0x30335652 && type2 >= 0x20200002) - { - /* read secondary WxH for the cmsg24[] (see vd_realvid.c) */ - ((unsigned short *)(bih+1))[4] = 4 * (unsigned short) src[0]; - ((unsigned short *)(bih+1))[5] = 4 * (unsigned short) src[1]; - } - else - memset(&dst[8], 0, 4); + ((unsigned int *) dst)[0] = rvp->type1; + ((unsigned int *) dst)[1] = rvp->type2; + stream_read(demuxer->stream, dst+8, cnt); track->realmedia = 1; #ifdef USE_QTX_CODECS |