[vlc-devel] commit: [FFmpeg] support for native RV40 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec 17 20:56:05 2008 +0100| [40a42de8a814256cb571582ec343ff3e0c8337ea] | committer: Jean-Baptiste Kempf 

[FFmpeg] support for native RV40
(cherry picked from commit 07dc019fff656ff82057828e044b66321f48172a)

Conflicts:

	modules/codec/avcodec/fourcc.h

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=40a42de8a814256cb571582ec343ff3e0c8337ea
---

 modules/codec/avcodec/fourcc.h |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/codec/avcodec/fourcc.h b/modules/codec/avcodec/fourcc.h
index f031449..0cd5824 100644
--- a/modules/codec/avcodec/fourcc.h
+++ b/modules/codec/avcodec/fourcc.h
@@ -543,20 +543,27 @@ static const struct
 
     /* Real Video */
     { VLC_FOURCC('R','V','1','0'), CODEC_ID_RV10,
-      VIDEO_ES, "Real Video 10" },
+      VIDEO_ES, "Real Video 1.0" },
     { VLC_FOURCC('r','v','1','0'), CODEC_ID_RV10,
-      VIDEO_ES, "Real Video 10" },
+      VIDEO_ES, "Real Video 1.0" },
     { VLC_FOURCC('R','V','1','3'), CODEC_ID_RV10,
-      VIDEO_ES, "Real Video 13" },
+      VIDEO_ES, "Real Video 1.3" },
     { VLC_FOURCC('r','v','1','3'), CODEC_ID_RV10,
       VIDEO_ES, "Real Video 13" },
 #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(15<<8)+1)
     { VLC_FOURCC('R','V','2','0'), CODEC_ID_RV20,
-      VIDEO_ES, "Real Video 20" },
+      VIDEO_ES, "Real Video 2.0" },
     { VLC_FOURCC('r','v','2','0'), CODEC_ID_RV20,
-      VIDEO_ES, "Real Video 20" },
+      VIDEO_ES, "Real Video 2.0" },
+#endif
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(5<<8)+0)
+    { VLC_FOURCC('R','V','4','0'), CODEC_ID_RV40,
+      VIDEO_ES, "Real Video 4.0" },
+    { VLC_FOURCC('r','v','4','0'), CODEC_ID_RV40,
+      VIDEO_ES, "Real Video 4.0" },
 #endif
 
+
     /* Apple Video */
     { VLC_FOURCC('r','p','z','a'), CODEC_ID_RPZA,
       VIDEO_ES, "Apple Video" },