diff options
| author | David Conrad <lessen42@gmail.com> | 2007-09-06 05:14:09 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2007-09-06 05:14:09 +0000 |
| commit | c3ce416105634e4fab9941a451ca69bc4cdda394 (patch) | |
| tree | af2188cc1518e15b02bf977b13de8eae29939a64 /libavformat | |
| parent | 1ddcd07fda62291b48ef328802ce0de42023e7f4 (diff) | |
| download | ffmpeg-c3ce416105634e4fab9941a451ca69bc4cdda394.tar.gz | |
Use V_MPEG4/ISO/ASP for mpeg4 when muxing mkv
Originally committed as revision 10421 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroska.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 1d4ed5702d..eded899f47 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -24,8 +24,8 @@ CodecTags ff_mkv_codec_tags[]={ // {"V_MS/VFW/FOURCC" , CODEC_ID_NONE}, {"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO}, - {"V_MPEG4/ISO/SP" , CODEC_ID_MPEG4}, {"V_MPEG4/ISO/ASP" , CODEC_ID_MPEG4}, + {"V_MPEG4/ISO/SP" , CODEC_ID_MPEG4}, {"V_MPEG4/ISO/AP" , CODEC_ID_MPEG4}, {"V_MPEG4/ISO/AVC" , CODEC_ID_H264}, {"V_MPEG4/MS/V3" , CODEC_ID_MSMPEG4V3}, |