Use V_MPEG4/ISO/ASP for mpeg4 when muxing mkv

Originally committed as revision 10421 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 1d4ed5702d7f663675e96ec2a583702905b07bdb..eded899f47272eb3c770c6f0d73ff9eb015b0b3d 100644 (file)
--- 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},