From c3ce416105634e4fab9941a451ca69bc4cdda394 Mon Sep 17 00:00:00 2001
From: David Conrad <lessen42@gmail.com>
Date: Thu, 6 Sep 2007 05:14:09 +0000
Subject: Use V_MPEG4/ISO/ASP for mpeg4 when muxing mkv

Originally committed as revision 10421 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/matroska.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libavformat/matroska.c')

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},
-- 
cgit v1.2.3