github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-14 11:54:36 +02:00
Code Releases Activity

Support for AVC in Matroska.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14459 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
mosu 2005-01-11 08:30:56 +00:00
parent be039de030
commit 06bca786bd
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libmpdemux/demux_mkv.c
View File

@ -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 "

1
libmpdemux/matroska.h
View File

@ -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"