FFMPEG, MPEG-4 FOURCCs... I hope I did not forget too many of them :D

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 447dca6f25bb12fb6ff9f6152057b9230f9ef2a3..f0d951520d136227979b101b752fd6f1df95271c 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -593,6 +593,8 @@ static struct
       VIDEO_ES, "MPEG-4 Video" },
     { VLC_FOURCC('d','x','5','0'), CODEC_ID_MPEG4,
       VIDEO_ES, "MPEG-4 Video" },
+    { VLC_FOURCC('D','X','G','M'), CODEC_ID_MPEG4,
+      VIDEO_ES, "Electronic Arts Game MPEG-4 Video" },
     { VLC_FOURCC('m','p','4','v'), CODEC_ID_MPEG4,
       VIDEO_ES, "MPEG-4 Video" },
     { VLC_FOURCC('M','P','4','V'), CODEC_ID_MPEG4,
@@ -605,6 +607,8 @@ static struct
       VIDEO_ES, "MPEG-4 Video" },
     { VLC_FOURCC('F','M','P','4'), CODEC_ID_MPEG4,
       VIDEO_ES, "MPEG-4 Video" },
+    { VLC_FOURCC('f','m','p','4'), CODEC_ID_MPEG4,
+      VIDEO_ES, "MPEG-4 Video" },
     /* 3ivx delta 3.5 Unsupported
      * putting it here gives extreme distorted images
     { VLC_FOURCC('3','I','V','1'), CODEC_ID_MPEG4,
@@ -616,6 +620,22 @@ static struct
       VIDEO_ES, "MPEG-4 Video" },
     { VLC_FOURCC('3','i','v','2'), CODEC_ID_MPEG4,
       VIDEO_ES, "MPEG-4 Video" },
+    { VLC_FOURCC('B','L','Z','0'), CODEC_ID_MPEG4,
+      VIDEO_ES, "Blizzard MPEG-4 Video" },
+    { VLC_FOURCC('U','M','P','4'), CODEC_ID_MPEG4,
+      VIDEO_ES, "UB MPEG-4 Video" },
+    { VLC_FOURCC('W','V','1','F'), CODEC_ID_MPEG4,
+      VIDEO_ES, "MPEG-4 Video" },
+    { VLC_FOURCC('S','E','D','G'), CODEC_ID_MPEG4,
+      VIDEO_ES, "Samsung MPEG-4 Video" },
+    { VLC_FOURCC('R','M','P','4'), CODEC_ID_MPEG4,
+      VIDEO_ES, "REALmagic MPEG-4 Video" },
+    { VLC_FOURCC('H','D','X','4'), CODEC_ID_MPEG4,
+      VIDEO_ES, "Jomigo HDX4 (MPEG-4 Video)" },
+    { VLC_FOURCC('h','d','x','4'), CODEC_ID_MPEG4,
+      VIDEO_ES, "Jomigo HDX4 (MPEG-4 Video)" },
+    { VLC_FOURCC('S','M','P','4'), CODEC_ID_MPEG4,
+      VIDEO_ES, "Samsung SMP4 (MPEG-4 Video)" },
 
     /* MSMPEG4 v1 */
     { VLC_FOURCC('D','I','V','1'), CODEC_ID_MSMPEG4V1,
@@ -663,6 +683,10 @@ static struct
       VIDEO_ES, "MS MPEG-4 Video v3" },
     { VLC_FOURCC('d','i','v','6'), CODEC_ID_MSMPEG4V3,
       VIDEO_ES, "MS MPEG-4 Video v3" },
+    { VLC_FOURCC('C','O','L','1'), CODEC_ID_MSMPEG4V3,
+      VIDEO_ES, "MS MPEG-4 Video v3" },
+    { VLC_FOURCC('C','O','L','0'), CODEC_ID_MSMPEG4V3,
+      VIDEO_ES, "MS MPEG-4 Video v3" },
     /* AngelPotion stuff */
     { VLC_FOURCC('A','P','4','1'), CODEC_ID_MSMPEG4V3,
       VIDEO_ES, "MS MPEG-4 Video v3" },