Support for Indeo4 decoding

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 4aa46a5c231b20ad1a64d8e5bf611a8c7c4af851..7e1d6ba44361abd36d98ef566e6bae32b8fe0b90 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -71,7 +71,6 @@
 #define VLC_CODEC_SP5X      VLC_FOURCC('S','P','5','X')
 #define VLC_CODEC_DV        VLC_FOURCC('d','v',' ',' ')
 #define VLC_CODEC_MSRLE     VLC_FOURCC('m','r','l','e')
-#define VLC_CODEC_INDEO3    VLC_FOURCC('I','V','3','1')
 #define VLC_CODEC_HUFFYUV   VLC_FOURCC('H','F','Y','U')
 #define VLC_CODEC_FFVHUFF   VLC_FOURCC('F','F','V','H')
 #define VLC_CODEC_ASV1      VLC_FOURCC('A','S','V','1')
@@ -98,6 +97,9 @@
 #define VLC_CODEC_WNV1      VLC_FOURCC('W','N','V','1')
 #define VLC_CODEC_AASC      VLC_FOURCC('A','A','S','C')
 #define VLC_CODEC_INDEO2    VLC_FOURCC('I','V','2','0')
+#define VLC_CODEC_INDEO3    VLC_FOURCC('I','V','3','1')
+#define VLC_CODEC_INDEO4    VLC_FOURCC('I','V','4','1')
+#define VLC_CODEC_INDEO5    VLC_FOURCC('I','V','5','0')
 #define VLC_CODEC_FLASHSV   VLC_FOURCC('F','S','V','1')
 #define VLC_CODEC_KMVC      VLC_FOURCC('K','M','V','C')
 #define VLC_CODEC_SMACKVIDEO VLC_FOURCC('S','M','K','2')
@@ -113,7 +115,6 @@
 #define VLC_CODEC_CDG       VLC_FOURCC('C','D','G',' ')
 #define VLC_CODEC_FRWU      VLC_FOURCC('F','R','W','U')
 #define VLC_CODEC_AMV       VLC_FOURCC('A','M','V',' ')
-#define VLC_CODEC_INDEO5    VLC_FOURCC('I','V','5','0')
 #define VLC_CODEC_VP8       VLC_FOURCC('V','P','8','0')
 #define VLC_CODEC_JPEG2000  VLC_FOURCC('J','P','2','K')
 #define VLC_CODEC_LAGARITH  VLC_FOURCC('L','A','G','S')

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index ccccb2f5cdcf8cc0de3ef701b6496846e23ddd9e..2772ac4f2894f9076651b28c54707e3f86f37839 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -235,6 +235,10 @@ static const struct
     { VLC_CODEC_PRORES, CODEC_ID_PRORES, VIDEO_ES },
 #endif
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 32, 0 )
+    { VLC_CODEC_PRORES, CODEC_ID_INDEO4, VIDEO_ES },
+#endif
+
 
 #if 0
 /*    UNTESTED VideoGames*/

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index f98c4bd64deeffd583f8b96db6e1668a7e03298f..4f405b9dabdf1bf4b08b8e9a9746d4a4c1c5aa53 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -669,6 +669,10 @@ static const entry_t p_list_video[] = {
     B(VLC_CODEC_FRWU, "Forward Uncompressed" ),
         A("FRWU"),
 
+    B(VLC_CODEC_INDEO4, "Indeo Video v4"),
+        A("IV41"),
+        A("iv41"),
+
     B(VLC_CODEC_INDEO5, "Indeo Video v5"),
         A("IV50"),
         A("iv50"),