Commit c3ce4161 authored by David Conrad's avatar David Conrad
Browse files

Use V_MPEG4/ISO/ASP for mpeg4 when muxing mkv

Originally committed as revision 10421 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1ddcd07f
......@@ -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},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment