* added 'M264' as FOURCC for H.263 (used by MS's encoder)

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index ce39257eaf9f8f9a194a1e8ed3320a53ebd705d9..16e43c8ebf112aeb05e2a3eb30ac8c8263debd8f 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -642,6 +642,8 @@ static struct
       VIDEO_ES, "H263" },
     { VLC_FOURCC('U','2','6','3'), CODEC_ID_H263,
       VIDEO_ES, "H263" },
+    { VLC_FOURCC('M','2','6','3'), CODEC_ID_H263,
+      VIDEO_ES, "H263" },
 
     /* H263i */
     { VLC_FOURCC('I','2','6','3'), CODEC_ID_H263I,