diff options
| author | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-11 08:30:56 +0000 |
|---|---|---|
| committer | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-11 08:30:56 +0000 |
| commit | 06bca786bddba60ed764f9bb22775b7edd302060 (patch) | |
| tree | 576d323bc010bf1a3e538b87c04c769053330fdb /libmpdemux | |
| parent | be039de030358f6458594ab6f3f6bff8cfb054de (diff) | |
| download | mpv-06bca786bddba60ed764f9bb22775b7edd302060.tar.bz2 mpv-06bca786bddba60ed764f9bb22775b7edd302060.tar.xz | |
Support for AVC in Matroska.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14459 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 11 | ||||
| -rw-r--r-- | libmpdemux/matroska.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 46660d06f3..a5d1580b57 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1673,6 +1673,17 @@ demux_mkv_open_video (demuxer_t *demuxer, mkv_track_t *track) bih->biCompression = mmioFOURCC('m', 'p', 'g', '2'); track->reorder_timecodes = 1; } + else if (!strcmp(track->codec_id, MKV_V_MPEG4_AVC)) + { + bih->biCompression = mmioFOURCC('a', 'v', 'c', '1'); + if (track->private_data && (track->private_size > 0)) + { + bih->biSize += track->private_size; + bih = (BITMAPINFOHEADER *) realloc (bih, bih->biSize); + memcpy (bih + 1, track->private_data, track->private_size); + } + track->reorder_timecodes = 1; + } else { mp_msg (MSGT_DEMUX,MSGL_WARN,"[mkv] Unknown/unsupported CodecID " diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h index 218cc42827..b2abdb5411 100644 --- a/libmpdemux/matroska.h +++ b/libmpdemux/matroska.h @@ -47,6 +47,7 @@ #define MKV_V_QUICKTIME "V_QUICKTIME" #define MKV_V_MPEG1 "V_MPEG1" #define MKV_V_MPEG2 "V_MPEG2" +#define MKV_V_MPEG4_AVC "V_MPEG4/ISO/AVC" #define MKV_S_TEXTASCII "S_TEXT/ASCII" #define MKV_S_TEXTUTF8 "S_TEXT/UTF8" |