Use V_MPEG4/ISO/ASP for mpeg4 when muxing mkv

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

Use V_MPEG4/ISO/ASP for mpeg4 when muxing mkv
Originally committed as revision 10421 to svn://svn.ffmpeg.org/ffmpeg/trunk
c3ce4161 · David Conrad · 1ddcd07f · c3ce4161
Commit c3ce4161 authored Sep 06, 2007 by David Conrad
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

matroska.c libavformat/matroska.c +1 -1

No files found.
--- 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},