From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sun, 14 Feb 2010 12:03:15 +0000 (+0100)
Subject: Support for Indeo 5
X-Git-Tag: 1.1.0-ff~52
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d9666c8a60e61d63c21b25c6de9b07741bf0b151;p=vlc

Support for Indeo 5

May Kostya Shishkov be praised for this.
---

diff --git a/NEWS b/NEWS
index 92c5b5dbdf..9776fb9b8e 100644
--- a/NEWS
+++ b/NEWS
@@ -22,12 +22,13 @@ Decoders:
  * HD dvb subtitles - Display Definition Segment support
  * PGS subtitles for Blu-Ray
  * Invmem module improvements
- * Support for Atrac1 codec
+ * Support for Atrac1 audio codec
  * Support for SSE3 and SSE4 capabilities
+ * Multiple improvements for subtitles styles .SRT and .SSA
  * Support for DxVA2 for H.264 decoding on GPU on Windows Vista and 7
  * Support for VAAPI for H.264 decoding on GPU on GNU/Linux
- * Multiple improvements for subtitles styles .SRT and .SSA
  * Audio/Video decoder using OpenMAX IL components
+ * Support for Indeo5 video codec
 
 Demuxers:
  * Support for ADPCM in .flv streams
diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index cfb17aac80..f766933fdc 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -112,6 +112,7 @@
 #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')
 
 
 /* Planar YUV 4:1:0 Y:V:U */
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 6f695b0c3b..fbec4592ea 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -200,6 +200,10 @@ static const struct
     { VLC_CODEC_FRWU, CODEC_ID_FRWU, VIDEO_ES },
 #endif
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 53, 0 )
+    { VLC_CODEC_INDEO5, CODEC_ID_INDEO5, VIDEO_ES },
+#endif
+
     /* Videogames Codecs */
 
     { VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },
@@ -216,6 +220,7 @@ static const struct
 
     { VLC_CODEC_AMV, CODEC_ID_AMV, VIDEO_ES },
 
+
 #if 0
 /*    UNTESTED VideoGames*/
     { VLC_FOURCC('W','C','3','V'), CODEC_ID_XAN_WC3,
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 59a783a953..d196721737 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -607,6 +607,11 @@ static const entry_t p_list_video[] = {
     B(VLC_CODEC_FRWU, "Forward Uncompressed" ),
         A("FRWU"),
 
+    B(VLC_CODEC_INDEO5, "Indeo Video v5"),
+        A("IV50"),
+        A("iv50"),
+
+
     /* */
     B(VLC_CODEC_YV12, "Planar 4:2:0 YVU"),
         A("YV12"),