[vlc-commits] Add FSV2 FourCC and link in avcodec module
Jean-Baptiste Kempf
git at videolan.org
Mon Jul 25 00:42:44 CEST 2011
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jul 25 00:39:45 2011 +0200| [ea1463676e4558297cf4e901edc9fc6bbce85784] | committer: Jean-Baptiste Kempf
Add FSV2 FourCC and link in avcodec module
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ea1463676e4558297cf4e901edc9fc6bbce85784
---
include/vlc_fourcc.h | 1 +
modules/codec/avcodec/fourcc.c | 4 ++++
src/misc/fourcc.c | 5 ++++-
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 9aebbba..de16bab 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -116,6 +116,7 @@
#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')
+#define VLC_CODEC_FLASHSV2 VLC_FOURCC('F','S','V','2')
/* Planar YUV 4:1:0 Y:V:U */
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index b9d0d73..4de806b 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -222,6 +222,10 @@ static const struct
{ VLC_CODEC_AMV, CODEC_ID_AMV, VIDEO_ES },
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 7, 0 )
+ { VLC_CODEC_FLASHSV2, CODEC_ID_FLASHSV2, VIDEO_ES },
+#endif
+
#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 9293335..5ef2708 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -588,9 +588,12 @@ static const entry_t p_list_video[] = {
A("IV20"),
A("RT21"),
- /* Flash Screen Video */
+ /* Flash Screen Video */
B(VLC_CODEC_FLASHSV, "Flash Screen Video"),
A("FSV1"),
+ B(VLC_CODEC_FLASHSV2, "Flash Screen Video 2"),
+ A("FSV2"),
+
B(VLC_CODEC_KMVC, "Karl Morton's Video Codec (Worms)"),
A("KMVC"),
More information about the vlc-commits
mailing list