From bb2ef16f5323fd4207323ac5a846ace6dfaeaf23 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Thu, 15 Oct 2009 23:16:10 +0200 Subject: [PATCH] Support for Forward Uncompressed video --- include/vlc_fourcc.h | 2 ++ modules/codec/avcodec/fourcc.c | 12 ++++++++---- src/misc/fourcc.c | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index 8563d12c34..dc025802cc 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -110,6 +110,8 @@ #define VLC_CODEC_MDEC VLC_FOURCC('M','D','E','C') #define VLC_CODEC_VMDVIDEO VLC_FOURCC('V','M','D','V') #define VLC_CODEC_CDG VLC_FOURCC('C','D','G',' ') +#define VLC_CODEC_FRWU VLC_FOURCC('F','R','W','U') + /* Planar YUV 4:2:0 Y:V:U */ #define VLC_CODEC_YV12 VLC_FOURCC('Y','V','1','2') diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index a787eef777..7705e78396 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -187,10 +187,18 @@ static const struct { VLC_CODEC_MIMIC, CODEC_ID_MIMIC, VIDEO_ES }, #endif +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 55, 0 ) + { VLC_CODEC_DIRAC, CODEC_ID_DIRAC, VIDEO_ES }, +#endif + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 29, 0 ) { VLC_CODEC_V210, CODEC_ID_V210, VIDEO_ES }, #endif +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 37, 0 ) + { VLC_CODEC_FRWU, CODEC_ID_FRWU, VIDEO_ES }, +#endif + /* Videogames Codecs */ { VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES }, @@ -246,10 +254,6 @@ static const struct { VLC_CODEC_TARGA, CODEC_ID_TARGA, VIDEO_ES }, { VLC_CODEC_SGI, CODEC_ID_SGI, VIDEO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 55, 0 ) - { VLC_CODEC_DIRAC, CODEC_ID_DIRAC, VIDEO_ES }, -#endif - /* * Audio Codecs */ diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c index 38b8ead419..bc022700b4 100644 --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -602,6 +602,9 @@ static const entry_t p_list_video[] = { B(VLC_CODEC_CDG, "CD-G Video"), A("CDG "), + B(VLC_CODEC_FRWU, "Forward Uncompressed" ), + A("FRWU"), + /* */ B(VLC_CODEC_YV12, "Planar 4:2:0 YVU"), A("YV12"), -- 2.39.5