X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Favcodec%2Ffourcc.c;h=c5902480111c2fe6117552ae42bddcc76a71a5b7;hb=285861a17c274cb1002935698f117739a875d059;hp=3e3d30a8c1b30709c620b3c8358d4de4144bef07;hpb=07dc019fff656ff82057828e044b66321f48172a;p=vlc diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index 3e3d30a8c1..c590248011 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -38,10 +38,6 @@ #endif #include "avcodec.h" -#ifndef AV_VERSION_INT -# define AV_VERSION_INT(a, b, c) ((a)<<16 | (b)<<8 | (c)) -#endif - /***************************************************************************** * Codec fourcc -> ffmpeg_id mapping *****************************************************************************/ @@ -50,698 +46,163 @@ static const struct vlc_fourcc_t i_fourcc; int i_codec; int i_cat; - const char psz_name[36]; } codecs_table[] = { /* * Video Codecs */ - /* MPEG-1 Video */ - { VLC_FOURCC('m','p','1','v'), CODEC_ID_MPEG1VIDEO, - VIDEO_ES, "MPEG-1 Video" }, - { VLC_FOURCC('m','p','e','g'), CODEC_ID_MPEG1VIDEO, - VIDEO_ES, "MPEG-1 Video" }, - { VLC_FOURCC('m','p','g','1'), CODEC_ID_MPEG1VIDEO, - VIDEO_ES, "MPEG-1 Video" }, - { VLC_FOURCC('P','I','M','1'), CODEC_ID_MPEG1VIDEO, - VIDEO_ES, "Pinnacle DC1000 (MPEG-1 Video)" }, - - /* MPEG-2 Video */ - { VLC_FOURCC('m','p','2','v'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "MPEG-2 Video" }, - { VLC_FOURCC('M','P','E','G'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "MPEG-2 Video" }, - { VLC_FOURCC('m','p','g','v'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "MPEG-2 Video" }, - { VLC_FOURCC('m','p','g','2'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "MPEG-2 Video" }, - { VLC_FOURCC('h','d','v','1'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "HDV 720p30 (MPEG-2 Video)" }, - { VLC_FOURCC('h','d','v','2'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "Sony HDV (MPEG-2 Video)" }, - { VLC_FOURCC('h','d','v','3'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "FCP HDV (MPEG-2 Video)" }, - { VLC_FOURCC('h','d','v','5'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "HDV 720p25 (MPEG-2 Video)" }, - { VLC_FOURCC('m','x','5','n'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "MPEG2 IMX NTSC 525/60 50mb/s (FCP)" }, - { VLC_FOURCC('m','x','5','p'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "MPEG2 IMX PAL 625/60 50mb/s (FCP)" }, - { VLC_FOURCC('m','x','4','n'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "MPEG2 IMX NTSC 525/60 40mb/s (FCP)" }, - { VLC_FOURCC('m','x','4','p'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "MPEG2 IMX PAL 625/50 40mb/s (FCP)" }, - { VLC_FOURCC('m','x','3','n'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "MPEG2 IMX NTSC 525/60 30mb/s (FCP)" }, - { VLC_FOURCC('m','x','3','p'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "MPEG2 IMX NTSC 625/50 30mb/s (FCP)" }, - { VLC_FOURCC('x','d','v','2'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "XDCAM HD 1080i60" }, - { VLC_FOURCC('A','V','m','p'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "AVID IMX PAL" }, - /* ATI VCR2 */ - { VLC_FOURCC('V','C','R','2'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "ATI VCR2 Video" }, - { VLC_FOURCC('M','M','E','S'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "Matrox MPEG-2" }, - { VLC_FOURCC('m','m','e','s'), CODEC_ID_MPEG2VIDEO, - VIDEO_ES, "Matrox MPEG-2" }, - - /* MPEG-4 Video */ - { VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('d','i','v','x'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('M','P','4','S'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('m','p','4','s'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('M','4','S','2'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('m','4','s','2'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - /* XVID flavours */ - { VLC_FOURCC('x','v','i','d'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('X','V','I','D'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('X','v','i','D'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('X','V','I','X'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('x','v','i','x'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - /* DX50 */ - { VLC_FOURCC('D','X','5','0'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('d','x','5','0'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('B','L','Z','0'), CODEC_ID_MPEG4, - VIDEO_ES, "Blizzard MPEG-4 Video" }, - { VLC_FOURCC('D','X','G','M'), CODEC_ID_MPEG4, - VIDEO_ES, "Electronic Arts Game MPEG-4 Video" }, - { VLC_FOURCC('m','p','4','v'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('M','P','4','V'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC( 4, 0, 0, 0 ), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('m','4','c','c'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('M','4','C','C'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('F','M','P','4'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('f','m','p','4'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, + { VLC_CODEC_MPGV, CODEC_ID_MPEG2VIDEO, VIDEO_ES }, + + { VLC_CODEC_MP4V, CODEC_ID_MPEG4, VIDEO_ES }, /* 3ivx delta 3.5 Unsupported * putting it here gives extreme distorted images - { VLC_FOURCC('3','I','V','1'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('3','i','v','1'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, */ - /* 3ivx delta 4 */ - { VLC_FOURCC('3','I','V','2'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('3','i','v','2'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('U','M','P','4'), CODEC_ID_MPEG4, - VIDEO_ES, "UB MPEG-4 Video" }, - { VLC_FOURCC('W','V','1','F'), CODEC_ID_MPEG4, - VIDEO_ES, "MPEG-4 Video" }, - { VLC_FOURCC('S','E','D','G'), CODEC_ID_MPEG4, - VIDEO_ES, "Samsung MPEG-4 Video" }, - { VLC_FOURCC('R','M','P','4'), CODEC_ID_MPEG4, - VIDEO_ES, "REALmagic MPEG-4 Video" }, - { VLC_FOURCC('H','D','X','4'), CODEC_ID_MPEG4, - VIDEO_ES, "Jomigo HDX4 (MPEG-4 Video)" }, - { VLC_FOURCC('h','d','x','4'), CODEC_ID_MPEG4, - VIDEO_ES, "Jomigo HDX4 (MPEG-4 Video)" }, - { VLC_FOURCC('S','M','P','4'), CODEC_ID_MPEG4, - VIDEO_ES, "Samsung SMP4 (MPEG-4 Video)" }, - { VLC_FOURCC('s','m','p','4'), CODEC_ID_MPEG4, - VIDEO_ES, "Samsung SMP4 (MPEG-4 Video)" }, - { VLC_FOURCC('f','v','f','w'), CODEC_ID_MPEG4, - VIDEO_ES, "FFmpeg MPEG-4" }, - { VLC_FOURCC('F','V','F','W'), CODEC_ID_MPEG4, - VIDEO_ES, "FFmpeg MPEG-4" }, - { VLC_FOURCC('V','I','D','M'), CODEC_ID_MPEG4, - VIDEO_ES, "vidm 4.01 codec" }, - - /* MSMPEG4 v1 */ - { VLC_FOURCC('D','I','V','1'), CODEC_ID_MSMPEG4V1, - VIDEO_ES, "MS MPEG-4 Video v1" }, - { VLC_FOURCC('d','i','v','1'), CODEC_ID_MSMPEG4V1, - VIDEO_ES, "MS MPEG-4 Video v1" }, - { VLC_FOURCC('M','P','G','4'), CODEC_ID_MSMPEG4V1, - VIDEO_ES, "MS MPEG-4 Video v1" }, - { VLC_FOURCC('m','p','g','4'), CODEC_ID_MSMPEG4V1, - VIDEO_ES, "MS MPEG-4 Video v1" }, - - /* MSMPEG4 v2 */ - { VLC_FOURCC('D','I','V','2'), CODEC_ID_MSMPEG4V2, - VIDEO_ES, "MS MPEG-4 Video v2" }, - { VLC_FOURCC('d','i','v','2'), CODEC_ID_MSMPEG4V2, - VIDEO_ES, "MS MPEG-4 Video v2" }, - { VLC_FOURCC('M','P','4','2'), CODEC_ID_MSMPEG4V2, - VIDEO_ES, "MS MPEG-4 Video v2" }, - { VLC_FOURCC('m','p','4','2'), CODEC_ID_MSMPEG4V2, - VIDEO_ES, "MS MPEG-4 Video v2" }, - - /* MSMPEG4 v3 / M$ mpeg4 v3 */ - { VLC_FOURCC('M','P','G','3'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('m','p','g','3'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('d','i','v','3'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('M','P','4','3'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('m','p','4','3'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - /* DivX 3.20 */ - { VLC_FOURCC('D','I','V','3'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('D','I','V','4'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('d','i','v','4'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('D','I','V','5'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('d','i','v','5'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('D','I','V','6'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('d','i','v','6'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - /* Cool Codec */ - { VLC_FOURCC('C','O','L','1'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('c','o','l','1'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('C','O','L','0'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('c','o','l','0'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - /* AngelPotion stuff */ - { VLC_FOURCC('A','P','4','1'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - /* 3ivx doctered divx files */ - { VLC_FOURCC('3','I','V','D'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('3','i','v','d'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - /* who knows? */ - { VLC_FOURCC('3','V','I','D'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - { VLC_FOURCC('3','v','i','d'), CODEC_ID_MSMPEG4V3, - VIDEO_ES, "MS MPEG-4 Video v3" }, - - /* Sorenson v1 */ - { VLC_FOURCC('S','V','Q','1'), CODEC_ID_SVQ1, - VIDEO_ES, "SVQ-1 (Sorenson Video v1)" }, - { VLC_FOURCC('s','v','q','1'), CODEC_ID_SVQ1, - VIDEO_ES, "SVQ-1 (Sorenson Video v1)" }, - { VLC_FOURCC('s','v','q','i'), CODEC_ID_SVQ1, - VIDEO_ES, "SVQ-1 (Sorenson Video v1)" }, - - /* Sorenson v3 */ - { VLC_FOURCC('S','V','Q','3'), CODEC_ID_SVQ3, - VIDEO_ES, "SVQ-3 (Sorenson Video v3)" }, - - /* h264 */ - { VLC_FOURCC('h','2','6','4'), CODEC_ID_H264, - VIDEO_ES, "H264 - MPEG-4 AVC (part 10)" }, - { VLC_FOURCC('H','2','6','4'), CODEC_ID_H264, - VIDEO_ES, "H264 - MPEG-4 AVC (part 10)" }, - { VLC_FOURCC('x','2','6','4'), CODEC_ID_H264, - VIDEO_ES, "H264 - MPEG-4 AVC (part 10)" }, - { VLC_FOURCC('X','2','6','4'), CODEC_ID_H264, - VIDEO_ES, "H264 - MPEG-4 AVC (part 10)" }, - /* avc1: special case h264 */ - { VLC_FOURCC('a','v','c','1'), CODEC_ID_H264, - VIDEO_ES, "H264 - MPEG-4 AVC (part 10)" }, - { VLC_FOURCC('A','V','C','1'), CODEC_ID_H264, - VIDEO_ES, "H264 - MPEG-4 AVC (part 10)" }, - { VLC_FOURCC('V','S','S','H'), CODEC_ID_H264, - VIDEO_ES, "Vanguard VSS H264" }, - { VLC_FOURCC('V','S','S','W'), CODEC_ID_H264, - VIDEO_ES, "Vanguard VSS H264" }, - { VLC_FOURCC('v','s','s','h'), CODEC_ID_H264, - VIDEO_ES, "Vanguard VSS H264" }, - { VLC_FOURCC('D','A','V','C'), CODEC_ID_H264, - VIDEO_ES, "Dicas MPEGable H.264/MPEG-4 AVC" }, - { VLC_FOURCC('d','a','v','c'), CODEC_ID_H264, - VIDEO_ES, "Dicas MPEGable H.264/MPEG-4 AVC" }, - -/* H263 and H263i */ -/* H263(+) is also known as Real Video 1.0 */ - - /* H263 */ - { VLC_FOURCC('D','2','6','3'), CODEC_ID_H263, - VIDEO_ES, "DEC H263" }, - { VLC_FOURCC('H','2','6','3'), CODEC_ID_H263, - VIDEO_ES, "H263" }, - { VLC_FOURCC('h','2','6','3'), CODEC_ID_H263, - VIDEO_ES, "H263" }, - { VLC_FOURCC('L','2','6','3'), CODEC_ID_H263, - VIDEO_ES, "LEAD H263" }, - { VLC_FOURCC('s','2','6','3'), CODEC_ID_H263, - VIDEO_ES, "H263" }, - { VLC_FOURCC('S','2','6','3'), CODEC_ID_H263, - VIDEO_ES, "H263" }, - { VLC_FOURCC('M','2','6','3'), CODEC_ID_H263, - VIDEO_ES, "Microsoft H263" }, - { VLC_FOURCC('X','2','6','3'), CODEC_ID_H263, - VIDEO_ES, "Xirlink H263" }, - - /* Zygo (partial) */ - { VLC_FOURCC('Z','y','G','o'), CODEC_ID_H263, - VIDEO_ES, "ITU H263+" }, - - /* H263i */ - { VLC_FOURCC('I','2','6','3'), CODEC_ID_H263I, - VIDEO_ES, "I263.I" }, - { VLC_FOURCC('i','2','6','3'), CODEC_ID_H263I, - VIDEO_ES, "I263.I" }, - - /* H263P */ - { VLC_FOURCC('v','i','v','1'), CODEC_ID_H263P, - VIDEO_ES, "H263+" }, - { VLC_FOURCC('v','i','v','O'), CODEC_ID_H263P, - VIDEO_ES, "H263+" }, - { VLC_FOURCC('v','i','v','2'), CODEC_ID_H263P, - VIDEO_ES, "H263+" }, - { VLC_FOURCC('U','2','6','3'), CODEC_ID_H263P, - VIDEO_ES, "UB H263+" }, - { VLC_FOURCC('I','L','V','R'), CODEC_ID_H263P, - VIDEO_ES, "ITU H263+" }, - - /* Flash (H263) variant */ - { VLC_FOURCC('F','L','V','1'), CODEC_ID_FLV1, - VIDEO_ES, "Flash Video" }, - - /* H261 */ - { VLC_FOURCC('H','2','6','1'), CODEC_ID_H261, - VIDEO_ES, "H.261" }, - { VLC_FOURCC('h','2','6','1'), CODEC_ID_H261, - VIDEO_ES, "H.261" }, - - { VLC_FOURCC('F','L','I','C'), CODEC_ID_FLIC, - VIDEO_ES, "Flic Video" }, - - /* MJPEG */ - { VLC_FOURCC( 'M','J','P','G' ), CODEC_ID_MJPEG, - VIDEO_ES, "Motion JPEG Video" }, - { VLC_FOURCC( 'm','j','p','g' ), CODEC_ID_MJPEG, - VIDEO_ES, "Motion JPEG Video" }, - { VLC_FOURCC( 'm','j','p','a' ), CODEC_ID_MJPEG, /* for mov file */ - VIDEO_ES, "Motion JPEG Video" }, - { VLC_FOURCC( 'j','p','e','g' ), CODEC_ID_MJPEG, - VIDEO_ES, "Motion JPEG Video" }, - { VLC_FOURCC( 'J','P','E','G' ), CODEC_ID_MJPEG, - VIDEO_ES, "Motion JPEG Video" }, - { VLC_FOURCC( 'J','F','I','F' ), CODEC_ID_MJPEG, - VIDEO_ES, "Motion JPEG Video" }, - { VLC_FOURCC( 'J','P','G','L' ), CODEC_ID_MJPEG, - VIDEO_ES, "Motion JPEG Video" }, - { VLC_FOURCC( 'A','V','D','J' ), CODEC_ID_MJPEG, - VIDEO_ES, "Motion JPEG Video" }, - { VLC_FOURCC( 'm','j','p','b' ), CODEC_ID_MJPEGB, /* for mov file */ - VIDEO_ES, "Motion JPEG B Video" }, - { VLC_FOURCC( 'L','J','P','G' ), CODEC_ID_LJPEG, - VIDEO_ES, "Lead Motion JPEG Video" }, - { VLC_FOURCC( 'L','J','P','G' ), CODEC_ID_MJPEG, - VIDEO_ES, "Lead Motion JPEG Video" }, - /* AVID MJPEG */ - { VLC_FOURCC( 'A','V','R','n' ), CODEC_ID_MJPEG, - VIDEO_ES, "Avid Motion JPEG" }, - { VLC_FOURCC( 'A','D','J','V' ), CODEC_ID_MJPEG, - VIDEO_ES, "Avid Motion JPEG" }, - { VLC_FOURCC( 'd','m','b','1' ), CODEC_ID_MJPEG, - VIDEO_ES, "Motion JPEG OpenDML Video" }, - { VLC_FOURCC( 'I','J','P','G' ), CODEC_ID_MJPEG, - VIDEO_ES, "Intergraph JPEG Video" }, - - /* SP5x */ - { VLC_FOURCC( 'S','P','5','X' ), CODEC_ID_SP5X, - VIDEO_ES, "Sunplus Motion JPEG Video" }, - { VLC_FOURCC( 'S','P','5','3' ), CODEC_ID_SP5X, - VIDEO_ES, "Sunplus Motion JPEG Video" }, - { VLC_FOURCC( 'S','P','5','4' ), CODEC_ID_SP5X, - VIDEO_ES, "Sunplus Motion JPEG Video" }, - { VLC_FOURCC( 'S','P','5','5' ), CODEC_ID_SP5X, - VIDEO_ES, "Sunplus Motion JPEG Video" }, - { VLC_FOURCC( 'S','P','5','6' ), CODEC_ID_SP5X, - VIDEO_ES, "Sunplus Motion JPEG Video" }, - { VLC_FOURCC( 'S','P','5','7' ), CODEC_ID_SP5X, - VIDEO_ES, "Sunplus Motion JPEG Video" }, - { VLC_FOURCC( 'S','P','5','8' ), CODEC_ID_SP5X, - VIDEO_ES, "Sunplus Motion JPEG Video" }, - - /* DV */ - { VLC_FOURCC('d','v','s','l'), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video" }, - { VLC_FOURCC('d','v','s','d'), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video" }, - { VLC_FOURCC('D','V','S','D'), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video" }, - { VLC_FOURCC('d','v','h','d'), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video" }, - { VLC_FOURCC('d','v','c',' '), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video" }, - { VLC_FOURCC('d','v','c','p'), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video PAL" }, - { VLC_FOURCC('d','v','p',' '), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video Pro" }, - { VLC_FOURCC('d','v','p','p'), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video Pro PAL" }, - { VLC_FOURCC('C','D','V','C'), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video" }, - { VLC_FOURCC('c','d','v','c'), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video" }, - { VLC_FOURCC('d','v','5','p'), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video C Pro 50 PAL" }, - { VLC_FOURCC('d','v','5','n'), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video C Pro 50 NTSC" }, - { VLC_FOURCC('A','V','d','v'), CODEC_ID_DVVIDEO, - VIDEO_ES, "AVID DV" }, - - /* Windows Media Video */ - { VLC_FOURCC('W','M','V','1'), CODEC_ID_WMV1, - VIDEO_ES, "Windows Media Video 1" }, - { VLC_FOURCC('w','m','v','1'), CODEC_ID_WMV1, - VIDEO_ES, "Windows Media Video 1" }, - { VLC_FOURCC('W','M','V','2'), CODEC_ID_WMV2, - VIDEO_ES, "Windows Media Video 2" }, - { VLC_FOURCC('w','m','v','2'), CODEC_ID_WMV2, - VIDEO_ES, "Windows Media Video 2" }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 10, 1 ) - { VLC_FOURCC('W','M','V','3'), CODEC_ID_WMV3, - VIDEO_ES, "Windows Media Video 3" }, - { VLC_FOURCC('w','m','v','3'), CODEC_ID_WMV3, - VIDEO_ES, "Windows Media Video 3" }, - { VLC_FOURCC('W','V','C','1'), CODEC_ID_VC1, - VIDEO_ES, "Windows Media Video VC1" }, - { VLC_FOURCC('w','v','c','1'), CODEC_ID_VC1, - VIDEO_ES, "Windows Media Video VC1" }, - /* WMVA is the VC-1 codec before the standardization proces, - it is not bitstream compatible and deprecated */ - { VLC_FOURCC('W','M','V','A'), CODEC_ID_VC1, - VIDEO_ES, "Windows Media Video Advanced Profile" }, -#endif + { VLC_FOURCC('3','I','V','1'), CODEC_ID_MPEG4, VIDEO_ES }, + { VLC_FOURCC('3','i','v','1'), CODEC_ID_MPEG4, VIDEO_ES }, */ + + { VLC_CODEC_DIV1, CODEC_ID_MSMPEG4V1, VIDEO_ES }, + { VLC_CODEC_DIV2, CODEC_ID_MSMPEG4V2, VIDEO_ES }, + { VLC_CODEC_DIV3, CODEC_ID_MSMPEG4V3, VIDEO_ES }, + + { VLC_CODEC_SVQ1, CODEC_ID_SVQ1, VIDEO_ES }, + { VLC_CODEC_SVQ3, CODEC_ID_SVQ3, VIDEO_ES }, + + { VLC_CODEC_H264, CODEC_ID_H264, VIDEO_ES }, + { VLC_CODEC_H263, CODEC_ID_H263, VIDEO_ES }, + { VLC_CODEC_H263I,CODEC_ID_H263I,VIDEO_ES }, + { VLC_CODEC_H263P,CODEC_ID_H263P,VIDEO_ES }, + + { VLC_CODEC_FLV1, CODEC_ID_FLV1, VIDEO_ES }, - /* Microsoft Video 1 */ - { VLC_FOURCC('M','S','V','C'), CODEC_ID_MSVIDEO1, - VIDEO_ES, "Microsoft Video 1" }, - { VLC_FOURCC('m','s','v','c'), CODEC_ID_MSVIDEO1, - VIDEO_ES, "Microsoft Video 1" }, - { VLC_FOURCC('C','R','A','M'), CODEC_ID_MSVIDEO1, - VIDEO_ES, "Microsoft Video 1" }, - { VLC_FOURCC('c','r','a','m'), CODEC_ID_MSVIDEO1, - VIDEO_ES, "Microsoft Video 1" }, - { VLC_FOURCC('W','H','A','M'), CODEC_ID_MSVIDEO1, - VIDEO_ES, "Microsoft Video 1" }, - { VLC_FOURCC('w','h','a','m'), CODEC_ID_MSVIDEO1, - VIDEO_ES, "Microsoft Video 1" }, - - /* Microsoft RLE */ - { VLC_FOURCC('m','r','l','e'), CODEC_ID_MSRLE, - VIDEO_ES, "Microsoft RLE Video" }, - { VLC_FOURCC('W','R','L','E'), CODEC_ID_MSRLE, - VIDEO_ES, "Microsoft RLE Video" }, - { VLC_FOURCC(0x1,0x0,0x0,0x0), CODEC_ID_MSRLE, - VIDEO_ES, "Microsoft RLE Video" }, - { VLC_FOURCC(0x2,0x0,0x0,0x0), CODEC_ID_MSRLE, - VIDEO_ES, "Microsoft RLE Video" }, + { VLC_CODEC_H261, CODEC_ID_H261, VIDEO_ES }, + { VLC_CODEC_FLIC, CODEC_ID_FLIC, VIDEO_ES }, + { VLC_CODEC_MJPG, CODEC_ID_MJPEG, VIDEO_ES }, + { VLC_CODEC_MJPGB,CODEC_ID_MJPEGB,VIDEO_ES }, + { VLC_CODEC_LJPG, CODEC_ID_LJPEG, VIDEO_ES }, + + { VLC_CODEC_SP5X, CODEC_ID_SP5X, VIDEO_ES }, + + { VLC_CODEC_DV, CODEC_ID_DVVIDEO, VIDEO_ES }, + + { VLC_CODEC_WMV1, CODEC_ID_WMV1, VIDEO_ES }, + { VLC_CODEC_WMV2, CODEC_ID_WMV2, VIDEO_ES }, + { VLC_CODEC_WMV3, CODEC_ID_WMV3, VIDEO_ES }, + + { VLC_CODEC_VC1, CODEC_ID_VC1, VIDEO_ES }, + + { VLC_CODEC_MSVIDEO1, CODEC_ID_MSVIDEO1, VIDEO_ES }, + { VLC_CODEC_MSRLE, CODEC_ID_MSRLE, VIDEO_ES }, + + { VLC_CODEC_INDEO2, CODEC_ID_INDEO2, VIDEO_ES }, /* Indeo Video Codecs (Quality of this decoder on ppc is not good) */ - { VLC_FOURCC('I','V','3','1'), CODEC_ID_INDEO3, - VIDEO_ES, "Indeo Video v3" }, - { VLC_FOURCC('i','v','3','1'), CODEC_ID_INDEO3, - VIDEO_ES, "Indeo Video v3" }, - { VLC_FOURCC('I','V','3','2'), CODEC_ID_INDEO3, - VIDEO_ES, "Indeo Video v3" }, - { VLC_FOURCC('i','v','3','2'), CODEC_ID_INDEO3, - VIDEO_ES, "Indeo Video v3" }, - - /* Huff YUV */ - { VLC_FOURCC('H','F','Y','U'), CODEC_ID_HUFFYUV, - VIDEO_ES, "Huff YUV Video" }, - { VLC_FOURCC('F','F','V','H'), CODEC_ID_FFVHUFF, - VIDEO_ES, "Huff YUV Video" }, - - /* Creative YUV */ - { VLC_FOURCC('C','Y','U','V'), CODEC_ID_CYUV, - VIDEO_ES, "Creative YUV Video" }, - { VLC_FOURCC('c','y','u','v'), CODEC_ID_CYUV, - VIDEO_ES, "Creative YUV Video" }, - - /* On2 VP3 Video Codecs */ - { VLC_FOURCC('V','P','3',' '), CODEC_ID_VP3, - VIDEO_ES, "On2's VP3 Video" }, - { VLC_FOURCC('V','P','3','0'), CODEC_ID_VP3, - VIDEO_ES, "On2's VP3 Video" }, - { VLC_FOURCC('V','P','3','1'), CODEC_ID_VP3, - VIDEO_ES, "On2's VP3 Video" }, - { VLC_FOURCC('v','p','3','1'), CODEC_ID_VP3, - VIDEO_ES, "On2's VP3 Video" }, - - /* On2 VP5, VP6 codecs */ -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 14, 0 ) - { VLC_FOURCC('V','P','5',' '), CODEC_ID_VP5, - VIDEO_ES, "On2's VP5 Video" }, - { VLC_FOURCC('V','P','5','0'), CODEC_ID_VP5, - VIDEO_ES, "On2's VP5 Video" }, - { VLC_FOURCC('V','P','6','2'), CODEC_ID_VP6, - VIDEO_ES, "On2's VP6.2 Video" }, - { VLC_FOURCC('v','p','6','2'), CODEC_ID_VP6, - VIDEO_ES, "On2's VP6.2 Video" }, - { VLC_FOURCC('V','P','6','F'), CODEC_ID_VP6F, - VIDEO_ES, "On2's VP6.2 Video (Flash)" }, -#endif + { VLC_CODEC_INDEO3, CODEC_ID_INDEO3, VIDEO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 27, 0 ) - { VLC_FOURCC('V','P','6','0'), CODEC_ID_VP6, - VIDEO_ES, "On2's VP6.0 Video" }, - { VLC_FOURCC('V','P','6','1'), CODEC_ID_VP6, - VIDEO_ES, "On2's VP6.1 Video" }, -#endif + { VLC_CODEC_HUFFYUV, CODEC_ID_HUFFYUV, VIDEO_ES }, + { VLC_CODEC_FFVHUFF, CODEC_ID_FFVHUFF, VIDEO_ES }, + { VLC_CODEC_CYUV, CODEC_ID_CYUV, VIDEO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 47, 0 ) - { VLC_FOURCC('V','P','6','A'), CODEC_ID_VP6A, - VIDEO_ES, "On2's VP6 A Video" }, -#endif + { VLC_CODEC_VP3, CODEC_ID_VP3, VIDEO_ES }, + { VLC_CODEC_VP5, CODEC_ID_VP5, VIDEO_ES }, + { VLC_CODEC_VP6, CODEC_ID_VP6, VIDEO_ES }, + { VLC_CODEC_VP6F, CODEC_ID_VP6F, VIDEO_ES }, + { VLC_CODEC_VP6A, CODEC_ID_VP6A, VIDEO_ES }, - /* Xiph.org theora */ - { VLC_FOURCC('t','h','e','o'), CODEC_ID_THEORA, - VIDEO_ES, "Xiph.org's Theora Video" }, - { VLC_FOURCC('T','h','r','a'), CODEC_ID_THEORA, - VIDEO_ES, "Xiph.org's Theora Video" }, + { VLC_CODEC_THEORA, CODEC_ID_THEORA, VIDEO_ES }, #if ( !defined( WORDS_BIGENDIAN ) ) /* Asus Video (Another thing that doesn't work on PPC) */ - { VLC_FOURCC('A','S','V','1'), CODEC_ID_ASV1, - VIDEO_ES, "Asus V1 Video" }, - { VLC_FOURCC('A','S','V','2'), CODEC_ID_ASV2, - VIDEO_ES, "Asus V2 Video" }, + { VLC_CODEC_ASV1, CODEC_ID_ASV1, VIDEO_ES }, + { VLC_CODEC_ASV2, CODEC_ID_ASV2, VIDEO_ES }, #endif - /* FFMPEG Video 1 (lossless codec) */ - { VLC_FOURCC('F','F','V','1'), CODEC_ID_FFV1, - VIDEO_ES, "FFMpeg Video 1" }, + { VLC_CODEC_FFV1, CODEC_ID_FFV1, VIDEO_ES }, - /* ATI VCR1 */ - { VLC_FOURCC('V','C','R','1'), CODEC_ID_VCR1, - VIDEO_ES, "ATI VCR1 Video" }, + { VLC_CODEC_VCR1, CODEC_ID_VCR1, VIDEO_ES }, - /* Cirrus Logic AccuPak */ - { VLC_FOURCC('C','L','J','R'), CODEC_ID_CLJR, - VIDEO_ES, "Creative Logic AccuPak" }, + { VLC_CODEC_CLJR, CODEC_ID_CLJR, VIDEO_ES }, /* Real Video */ - { VLC_FOURCC('R','V','1','0'), CODEC_ID_RV10, - VIDEO_ES, "Real Video 1.0" }, - { VLC_FOURCC('r','v','1','0'), CODEC_ID_RV10, - VIDEO_ES, "Real Video 1.0" }, - { VLC_FOURCC('R','V','1','3'), CODEC_ID_RV10, - VIDEO_ES, "Real Video 1.3" }, - { VLC_FOURCC('r','v','1','3'), CODEC_ID_RV10, - VIDEO_ES, "Real Video 1.3" }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 15, 1 ) - { VLC_FOURCC('R','V','2','0'), CODEC_ID_RV20, - VIDEO_ES, "Real Video 2.0" }, - { VLC_FOURCC('r','v','2','0'), CODEC_ID_RV20, - VIDEO_ES, "Real Video 2.0" }, + { VLC_CODEC_RV10, CODEC_ID_RV10, VIDEO_ES }, + { VLC_CODEC_RV20, CODEC_ID_RV20, VIDEO_ES }, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 8, 0 ) + { VLC_CODEC_RV30, CODEC_ID_RV30, VIDEO_ES }, #endif #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 5, 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" }, + { VLC_CODEC_RV40, CODEC_ID_RV40, VIDEO_ES }, #endif + { VLC_CODEC_RPZA, CODEC_ID_RPZA, VIDEO_ES }, - /* Apple Video */ - { VLC_FOURCC('r','p','z','a'), CODEC_ID_RPZA, - VIDEO_ES, "Apple Video" }, - { VLC_FOURCC('a','z','p','r'), CODEC_ID_RPZA, - VIDEO_ES, "Apple Video" }, + { VLC_CODEC_SMC, CODEC_ID_SMC, VIDEO_ES }, - { VLC_FOURCC('s','m','c',' '), CODEC_ID_SMC, - VIDEO_ES, "Apple graphics" }, + { VLC_CODEC_CINEPAK, CODEC_ID_CINEPAK, VIDEO_ES }, - /* CINEPAK. We have our own decoder with an higher priority, - but this can't harm */ - { VLC_FOURCC('C','V','I','D'), CODEC_ID_CINEPAK, - VIDEO_ES, "Cinepak Video" }, - { VLC_FOURCC('c','v','i','d'), CODEC_ID_CINEPAK, - VIDEO_ES, "Cinepak Video" }, + { VLC_CODEC_TSCC, CODEC_ID_TSCC, VIDEO_ES }, - /* Screen Capture Video Codecs */ - { VLC_FOURCC('t','s','c','c'), CODEC_ID_TSCC, - VIDEO_ES, "TechSmith Camtasia Screen Capture" }, - { VLC_FOURCC('T','S','C','C'), CODEC_ID_TSCC, - VIDEO_ES, "TechSmith Camtasia Screen Capture" }, + { VLC_CODEC_CSCD, CODEC_ID_CSCD, VIDEO_ES }, - { VLC_FOURCC('C','S','C','D'), CODEC_ID_CSCD, - VIDEO_ES, "CamStudio Screen Codec" }, - { VLC_FOURCC('c','s','c','d'), CODEC_ID_CSCD, - VIDEO_ES, "CamStudio Screen Codec" }, + { VLC_CODEC_ZMBV, CODEC_ID_ZMBV, VIDEO_ES }, - { VLC_FOURCC('Z','M','B','V'), CODEC_ID_ZMBV, - VIDEO_ES, "DosBox Capture Codec" }, + { VLC_CODEC_VMNC, CODEC_ID_VMNC, VIDEO_ES }, + { VLC_CODEC_FRAPS, CODEC_ID_FRAPS, VIDEO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 13, 0 ) - { VLC_FOURCC('V','M','n','c'), CODEC_ID_VMNC, - VIDEO_ES, "VMware Video" }, -#endif - { VLC_FOURCC('F','P','S','1'), CODEC_ID_FRAPS, - VIDEO_ES, "FRAPS: Realtime Video Capture" }, - { VLC_FOURCC('f','p','s','1'), CODEC_ID_FRAPS, - VIDEO_ES, "FRAPS: Realtime Video Capture" }, - - /* Duck TrueMotion */ - { VLC_FOURCC('D','U','C','K'), CODEC_ID_TRUEMOTION1, - VIDEO_ES, "Duck TrueMotion v1 Video" }, - { VLC_FOURCC('T','M','2','0'), CODEC_ID_TRUEMOTION2, - VIDEO_ES, "Duck TrueMotion v2.0 Video" }, - - /* FFMPEG's SNOW wavelet codec */ - { VLC_FOURCC('S','N','O','W'), CODEC_ID_SNOW, - VIDEO_ES, "FFMpeg SNOW wavelet Video" }, - { VLC_FOURCC('s','n','o','w'), CODEC_ID_SNOW, - VIDEO_ES, "FFMpeg SNOW wavelet Video" }, - - { VLC_FOURCC('r','l','e',' '), CODEC_ID_QTRLE, - VIDEO_ES, "Apple QuickTime RLE Video" }, - - { VLC_FOURCC('q','d','r','w'), CODEC_ID_QDRAW, - VIDEO_ES, "Apple QuickDraw Video" }, - - { VLC_FOURCC('Q','P','E','G'), CODEC_ID_QPEG, - VIDEO_ES, "QPEG Video" }, - { VLC_FOURCC('Q','1','.','0'), CODEC_ID_QPEG, - VIDEO_ES, "QPEG Video" }, - { VLC_FOURCC('Q','1','.','1'), CODEC_ID_QPEG, - VIDEO_ES, "QPEG Video" }, - - { VLC_FOURCC('U','L','T','I'), CODEC_ID_ULTI, - VIDEO_ES, "IBM Ultimotion Video" }, - - { VLC_FOURCC('V','I','X','L'), CODEC_ID_VIXL, - VIDEO_ES, "Miro/Pinnacle VideoXL Video" }, - { VLC_FOURCC('P','I','X','L'), CODEC_ID_VIXL, - VIDEO_ES, "Pinnacle VideoXL Video" }, - - { VLC_FOURCC('L','O','C','O'), CODEC_ID_LOCO, - VIDEO_ES, "LOCO Video" }, - - { VLC_FOURCC('W','N','V','1'), CODEC_ID_WNV1, - VIDEO_ES, "Winnov WNV1 Video" }, - - { VLC_FOURCC('A','A','S','C'), CODEC_ID_AASC, - VIDEO_ES, "Autodesc RLE Video" }, - - { VLC_FOURCC('I','V','2','0'), CODEC_ID_INDEO2, - VIDEO_ES, "Indeo Video v2" }, - { VLC_FOURCC('R','T','2','1'), CODEC_ID_INDEO2, - VIDEO_ES, "Indeo Video v2" }, - - /* Flash Screen Video */ -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 11, 0 ) - { VLC_FOURCC('F','S','V','1'), CODEC_ID_FLASHSV, - VIDEO_ES, "Flash Screen Video" }, -#endif - { VLC_FOURCC('K','M','V','C'), CODEC_ID_KMVC, - VIDEO_ES, "Karl Morton's Video Codec (Worms)" }, - -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 13, 0 ) - { VLC_FOURCC('N','U','V','1'), CODEC_ID_NUV, - VIDEO_ES, "Nuppel Video" }, - { VLC_FOURCC('R','J','P','G'), CODEC_ID_NUV, - VIDEO_ES, "Nuppel Video" }, -#endif + { VLC_CODEC_TRUEMOTION1, CODEC_ID_TRUEMOTION1, VIDEO_ES }, + { VLC_CODEC_TRUEMOTION2, CODEC_ID_TRUEMOTION2, VIDEO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 8, 0 ) - /* CODEC_ID_SMACKVIDEO */ - { VLC_FOURCC('S','M','K','2'), CODEC_ID_SMACKVIDEO, - VIDEO_ES, "Smacker Video" }, - { VLC_FOURCC('S','M','K','4'), CODEC_ID_SMACKVIDEO, - VIDEO_ES, "Smacker Video" }, -#endif + { VLC_CODEC_SNOW, CODEC_ID_SNOW, VIDEO_ES }, + + { VLC_CODEC_QTRLE, CODEC_ID_QTRLE, VIDEO_ES }, + + { VLC_CODEC_QDRAW, CODEC_ID_QDRAW, VIDEO_ES }, + + { VLC_CODEC_QPEG, CODEC_ID_QPEG, VIDEO_ES }, + + { VLC_CODEC_ULTI, CODEC_ID_ULTI, VIDEO_ES }, + + { VLC_CODEC_VIXL, CODEC_ID_VIXL, VIDEO_ES }, + + { VLC_CODEC_LOCO, CODEC_ID_LOCO, VIDEO_ES }, + + { VLC_CODEC_WNV1, CODEC_ID_WNV1, VIDEO_ES }, + + { VLC_CODEC_AASC, CODEC_ID_AASC, VIDEO_ES }, + + { VLC_CODEC_FLASHSV, CODEC_ID_FLASHSV, VIDEO_ES }, + { VLC_CODEC_KMVC, CODEC_ID_KMVC, VIDEO_ES }, + + { VLC_CODEC_NUV, CODEC_ID_NUV, VIDEO_ES }, + + { VLC_CODEC_SMACKVIDEO, CODEC_ID_SMACKVIDEO, VIDEO_ES }, /* Chinese AVS - Untested */ -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 8, 0 ) - { VLC_FOURCC('C','A','V','S'), CODEC_ID_CAVS, - VIDEO_ES, "Chinese AVS" }, -#endif + { VLC_CODEC_CAVS, CODEC_ID_CAVS, VIDEO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 0 ) /* Untested yet */ - { VLC_FOURCC('A','V','d','n'), CODEC_ID_DNXHD, - VIDEO_ES, "DNxHD" }, -#endif - { VLC_FOURCC('8','B','P','S'), CODEC_ID_8BPS, - VIDEO_ES, "8BPS" }, + { VLC_CODEC_DNXHD, CODEC_ID_DNXHD, VIDEO_ES }, + { VLC_CODEC_8BPS, CODEC_ID_8BPS, VIDEO_ES }, #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 52, 0 ) - { VLC_FOURCC('M','L','2','O'), CODEC_ID_MIMIC, - VIDEO_ES, "Mimic" }, + { VLC_CODEC_MIMIC, CODEC_ID_MIMIC, VIDEO_ES }, +#endif + +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 29, 0 ) + { VLC_CODEC_V210, CODEC_ID_V210, VIDEO_ES }, #endif /* Videogames Codecs */ - /* Interplay MVE */ - { VLC_FOURCC('i','m','v','e'), CODEC_ID_INTERPLAY_VIDEO, - VIDEO_ES, "Interplay MVE Video" }, - { VLC_FOURCC('I','N','P','V'), CODEC_ID_INTERPLAY_VIDEO, - VIDEO_ES, "Interplay MVE Video" }, + { VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES }, - /* Id Quake II CIN */ - { VLC_FOURCC('I','D','C','I'), CODEC_ID_IDCIN, - VIDEO_ES, "Id Quake II CIN Video" }, + { VLC_CODEC_IDCIN, CODEC_ID_IDCIN, VIDEO_ES }, - /* 4X Technologies */ - { VLC_FOURCC('4','x','m','v'), CODEC_ID_4XM, - VIDEO_ES, "4X Technologies Video" }, - { VLC_FOURCC('4','X','M','V'), CODEC_ID_4XM, - VIDEO_ES, "4X Technologies Video" }, + { VLC_CODEC_4XM, CODEC_ID_4XM, VIDEO_ES }, - /* Id RoQ */ - { VLC_FOURCC('R','o','Q','v'), CODEC_ID_ROQ, - VIDEO_ES, "Id RoQ Video" }, + { VLC_CODEC_ROQ, CODEC_ID_ROQ, VIDEO_ES }, - /* Sony Playstation MDEC */ - { VLC_FOURCC('M','D','E','C'), CODEC_ID_MDEC, - VIDEO_ES, "PSX MDEC Video" }, + { VLC_CODEC_MDEC, CODEC_ID_MDEC, VIDEO_ES }, - /* Sierra VMD */ - { VLC_FOURCC('v','m','d','v'), CODEC_ID_VMDVIDEO, - VIDEO_ES, "Sierra VMD Video" }, - { VLC_FOURCC('V','M','D','V'), CODEC_ID_VMDVIDEO, - VIDEO_ES, "Sierra VMD Video" }, + { VLC_CODEC_VMDVIDEO, CODEC_ID_VMDVIDEO, VIDEO_ES }, #if 0 /* UNTESTED VideoGames*/ @@ -770,328 +231,161 @@ static const struct /* * Image codecs */ - { VLC_FOURCC('p','n','g',' '), CODEC_ID_PNG, - VIDEO_ES, "PNG Image" }, - { VLC_FOURCC('p','p','m',' '), CODEC_ID_PPM, - VIDEO_ES, "PPM Image" }, - { VLC_FOURCC('p','g','m',' '), CODEC_ID_PGM, - VIDEO_ES, "PGM Image" }, - { VLC_FOURCC('p','g','m','y'), CODEC_ID_PGMYUV, - VIDEO_ES, "PGM YUV Image" }, - { VLC_FOURCC('p','a','m',' '), CODEC_ID_PAM, - VIDEO_ES, "PAM Image" }, - { VLC_FOURCC('M','J','L','S'), CODEC_ID_JPEGLS, - VIDEO_ES, "PAM Image" }, - -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 0, 0 ) - { VLC_FOURCC('b','m','p',' '), CODEC_ID_BMP, - VIDEO_ES, "BMP Image" }, -#endif + { VLC_CODEC_PNG, CODEC_ID_PNG, VIDEO_ES }, + { VLC_CODEC_PPM, CODEC_ID_PPM, VIDEO_ES }, + { VLC_CODEC_PGM, CODEC_ID_PGM, VIDEO_ES }, + { VLC_CODEC_PGMYUV, CODEC_ID_PGMYUV, VIDEO_ES }, + { VLC_CODEC_PAM, CODEC_ID_PAM, VIDEO_ES }, + { VLC_CODEC_JPEGLS, CODEC_ID_JPEGLS, VIDEO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 1 ) - { VLC_FOURCC('t','i','f','f'), CODEC_ID_TIFF, - VIDEO_ES, "TIFF Image" }, - { VLC_FOURCC('g','i','f',' '), CODEC_ID_GIF, - VIDEO_ES, "GIF Image" }, - { VLC_FOURCC('t','g','a',' '), CODEC_ID_TARGA, - VIDEO_ES, "Truevision Targa Image" }, - { VLC_FOURCC('m','t','g','a'), CODEC_ID_TARGA, - VIDEO_ES, "Truevision Targa Image" }, - { VLC_FOURCC('M','T','G','A'), CODEC_ID_TARGA, - VIDEO_ES, "Truevision Targa Image" }, -#endif -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 3 ) - { VLC_FOURCC('s','g','i',' '), CODEC_ID_SGI, - VIDEO_ES, "SGI Image" }, -#endif + { VLC_CODEC_BMP, CODEC_ID_BMP, VIDEO_ES }, + + { VLC_CODEC_TIFF, CODEC_ID_TIFF, VIDEO_ES }, + { VLC_CODEC_GIF, CODEC_ID_GIF, VIDEO_ES }, + { 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_FOURCC('d','r','a','c'), CODEC_ID_DIRAC, - VIDEO_ES, "Dirac" }, + { VLC_CODEC_DIRAC, CODEC_ID_DIRAC, VIDEO_ES }, #endif /* * Audio Codecs */ - /* Windows Media Audio 1 */ - { VLC_FOURCC('W','M','A','1'), CODEC_ID_WMAV1, - AUDIO_ES, "Windows Media Audio 1" }, - { VLC_FOURCC('w','m','a','1'), CODEC_ID_WMAV1, - AUDIO_ES, "Windows Media Audio 1" }, - - /* Windows Media Audio 2 */ - { VLC_FOURCC('W','M','A','2'), CODEC_ID_WMAV2, - AUDIO_ES, "Windows Media Audio 2" }, - { VLC_FOURCC('w','m','a','2'), CODEC_ID_WMAV2, - AUDIO_ES, "Windows Media Audio 2" }, - - /* DV Audio */ - { VLC_FOURCC('d','v','a','u'), CODEC_ID_DVAUDIO, - AUDIO_ES, "DV Audio" }, - { VLC_FOURCC('v','d','v','a'), CODEC_ID_DVAUDIO, - AUDIO_ES, "DV Audio" }, - { VLC_FOURCC('d','v','c','a'), CODEC_ID_DVAUDIO, - AUDIO_ES, "DV Audio" }, - { VLC_FOURCC('R','A','D','V'), CODEC_ID_DVAUDIO, - AUDIO_ES, "DV Audio" }, - - /* MACE-3 Audio */ - { VLC_FOURCC('M','A','C','3'), CODEC_ID_MACE3, - AUDIO_ES, "MACE-3 Audio" }, - - /* MACE-6 Audio */ - { VLC_FOURCC('M','A','C','6'), CODEC_ID_MACE6, - AUDIO_ES, "MACE-6 Audio" }, - -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 41, 1 ) - /* MUSEPACK7 Audio */ - { VLC_FOURCC('M','P','C',' '), CODEC_ID_MUSEPACK7, - AUDIO_ES, "MUSEPACK7 Audio" }, -#endif -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 48, 0 ) - /* MUSEPACK8 Audio */ - { VLC_FOURCC('M','P','C','K'), CODEC_ID_MUSEPACK8, - AUDIO_ES, "MUSEPACK8 Audio" }, - { VLC_FOURCC('M','P','C','8'), CODEC_ID_MUSEPACK8, - AUDIO_ES, "MUSEPACK8 Audio" }, -#endif + { VLC_CODEC_WMA1, CODEC_ID_WMAV1, AUDIO_ES }, + { VLC_CODEC_WMA2, CODEC_ID_WMAV2, AUDIO_ES }, - /* RealAudio 1.0 */ - { VLC_FOURCC('1','4','_','4'), CODEC_ID_RA_144, - AUDIO_ES, "RealAudio 1.0" }, - { VLC_FOURCC('l','p','c','J'), CODEC_ID_RA_144, - AUDIO_ES, "RealAudio 1.0" }, - - /* RealAudio 2.0 */ - { VLC_FOURCC('2','8','_','8'), CODEC_ID_RA_288, - AUDIO_ES, "RealAudio 2.0" }, - - /* MPEG Audio layer 1/2/3 */ - { VLC_FOURCC('m','p','g','a'), CODEC_ID_MP2, - AUDIO_ES, "MPEG Audio layer 1/2" }, - { VLC_FOURCC('m','p','3',' '), CODEC_ID_MP3, - AUDIO_ES, "MPEG Audio layer 1/2/3" }, - { VLC_FOURCC('.','m','p','3'), CODEC_ID_MP3, - AUDIO_ES, "MPEG Audio layer 1/2/3" }, - { VLC_FOURCC('M','P','3',' '), CODEC_ID_MP3, - AUDIO_ES, "MPEG Audio layer 1/2/3" }, - { VLC_FOURCC('L','A','M','E'), CODEC_ID_MP3, - AUDIO_ES, "MPEG Audio layer 1/2/3" }, - - /* A52 Audio (aka AC3) */ - { VLC_FOURCC('a','5','2',' '), CODEC_ID_AC3, - AUDIO_ES, "A52 Audio (aka AC3)" }, - { VLC_FOURCC('a','5','2','b'), CODEC_ID_AC3, /* VLC specific hack */ - AUDIO_ES, "A52 Audio (aka AC3)" }, + { VLC_CODEC_DVAUDIO, CODEC_ID_DVAUDIO, AUDIO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 0, 0 ) - { VLC_FOURCC('e','a','c','3'), CODEC_ID_EAC3, - AUDIO_ES, "A/52 B Audio (aka E-AC3)" }, -#endif + { VLC_CODEC_MACE3, CODEC_ID_MACE3, AUDIO_ES }, + { VLC_CODEC_MACE6, CODEC_ID_MACE6, AUDIO_ES }, + + { VLC_CODEC_MUSEPACK7, CODEC_ID_MUSEPACK7, AUDIO_ES }, + { VLC_CODEC_MUSEPACK8, CODEC_ID_MUSEPACK8, AUDIO_ES }, + + { VLC_CODEC_RA_144, CODEC_ID_RA_144, AUDIO_ES }, + { VLC_CODEC_RA_288, CODEC_ID_RA_288, AUDIO_ES }, - /* DTS Audio */ - { VLC_FOURCC('d','t','s',' '), CODEC_ID_DTS, - AUDIO_ES, "DTS Audio" }, + { VLC_CODEC_MPGA, CODEC_ID_MP3, AUDIO_ES }, - /* AAC audio */ - { VLC_FOURCC('m','p','4','a'), CODEC_ID_AAC, - AUDIO_ES, "MPEG AAC Audio" }, + { VLC_CODEC_A52, CODEC_ID_AC3, AUDIO_ES }, - /* AC-3 Audio (Dolby Digital) */ - { VLC_FOURCC('a','c','-','3'), CODEC_ID_AC3, - AUDIO_ES, "AC-3 Audio (Dolby Digital)" }, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 0, 0 ) + { VLC_CODEC_EAC3, CODEC_ID_EAC3, AUDIO_ES }, +#endif - /* 4X Technologies */ - { VLC_FOURCC('4','x','m','a'), CODEC_ID_ADPCM_4XM, - AUDIO_ES, "4X Technologies Audio" }, + { VLC_CODEC_DTS, CODEC_ID_DTS, AUDIO_ES }, - /* EA ADPCM */ - { VLC_FOURCC('A','D','E','A'), CODEC_ID_ADPCM_EA, - AUDIO_ES, "EA ADPCM Audio" }, + { VLC_CODEC_MP4A, CODEC_ID_AAC, AUDIO_ES }, - /* Interplay DPCM */ - { VLC_FOURCC('i','d','p','c'), CODEC_ID_INTERPLAY_DPCM, - AUDIO_ES, "Interplay DPCM Audio" }, + { VLC_CODEC_ADPCM_4XM, CODEC_ID_ADPCM_4XM, AUDIO_ES }, - /* Id RoQ */ - { VLC_FOURCC('R','o','Q','a'), CODEC_ID_ROQ_DPCM, - AUDIO_ES, "Id RoQ DPCM Audio" }, + { VLC_CODEC_ADPCM_EA, CODEC_ID_ADPCM_EA, AUDIO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 27, 0 ) - /* DCIN Audio */ - { VLC_FOURCC('D','C','I','A'), CODEC_ID_DSICINAUDIO, - AUDIO_ES, "Delphine CIN Audio" }, -#endif + { VLC_CODEC_INTERPLAY_DPCM, CODEC_ID_INTERPLAY_DPCM, AUDIO_ES }, - /* Sony Playstation XA ADPCM */ - { VLC_FOURCC('x','a',' ',' '), CODEC_ID_ADPCM_XA, - AUDIO_ES, "PSX XA ADPCM Audio" }, + { VLC_CODEC_ROQ_DPCM, CODEC_ID_ROQ_DPCM, AUDIO_ES }, - /* ADX ADPCM */ - { VLC_FOURCC('a','d','x',' '), CODEC_ID_ADPCM_ADX, - AUDIO_ES, "ADX ADPCM Audio" }, + { VLC_CODEC_DSICINAUDIO, CODEC_ID_DSICINAUDIO, AUDIO_ES }, - /* Westwood ADPCM */ - { VLC_FOURCC('A','I','W','S'), CODEC_ID_ADPCM_IMA_WS, - AUDIO_ES, "Westwood IMA ADPCM audio" }, + { VLC_CODEC_ADPCM_XA, CODEC_ID_ADPCM_XA, AUDIO_ES }, + { VLC_CODEC_ADPCM_ADX, CODEC_ID_ADPCM_ADX, AUDIO_ES }, + { VLC_CODEC_ADPCM_IMA_WS, CODEC_ID_ADPCM_IMA_WS, AUDIO_ES }, - /* Sierra VMD */ - { VLC_FOURCC('v','m','d','a'), CODEC_ID_VMDAUDIO, - AUDIO_ES, "Sierra VMD Audio" }, + { VLC_CODEC_VMDAUDIO, CODEC_ID_VMDAUDIO, AUDIO_ES }, - /* G.726 ADPCM */ - { VLC_FOURCC('g','7','2','6'), CODEC_ID_ADPCM_G726, - AUDIO_ES, "G.726 ADPCM Audio" }, + { VLC_CODEC_ADPCM_G726, CODEC_ID_ADPCM_G726, AUDIO_ES }, + { VLC_CODEC_ADPCM_SWF, CODEC_ID_ADPCM_SWF, AUDIO_ES }, - /* AMR */ - { VLC_FOURCC('s','a','m','r'), CODEC_ID_AMR_NB, - AUDIO_ES, "AMR narrow band" }, - { VLC_FOURCC('s','a','w','b'), CODEC_ID_AMR_WB, - AUDIO_ES, "AMR wide band" }, + { VLC_CODEC_AMR_NB, CODEC_ID_AMR_NB, AUDIO_ES }, + { VLC_CODEC_AMR_WB, CODEC_ID_AMR_WB, AUDIO_ES }, - /* FLAC */ - { VLC_FOURCC('f','l','a','c'), CODEC_ID_FLAC, - AUDIO_ES, "FLAC (Free Lossless Audio Codec)" }, + { VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES }, - /* ALAC */ - { VLC_FOURCC('a','l','a','c'), CODEC_ID_ALAC, - AUDIO_ES, "Apple Lossless Audio Codec" }, + { VLC_CODEC_ALAC, CODEC_ID_ALAC, AUDIO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 50, 0, 1 ) - /* QDM2 */ - { VLC_FOURCC('Q','D','M','2'), CODEC_ID_QDM2, - AUDIO_ES, "QDM2 Audio" }, -#endif + { VLC_CODEC_QDM2, CODEC_ID_QDM2, AUDIO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 0, 0 ) - /* COOK */ - { VLC_FOURCC('c','o','o','k'), CODEC_ID_COOK, - AUDIO_ES, "Cook Audio" }, -#endif + { VLC_CODEC_COOK, CODEC_ID_COOK, AUDIO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 4, 0 ) - /* TTA: The Lossless True Audio */ - { VLC_FOURCC('T','T','A','1'), CODEC_ID_TTA, - AUDIO_ES, "The Lossless True Audio" }, -#endif + { VLC_CODEC_TTA, CODEC_ID_TTA, AUDIO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 8, 0 ) - /* Shorten */ - { VLC_FOURCC('s','h','n',' '), CODEC_ID_SHORTEN, - AUDIO_ES, "Shorten Lossless Audio" }, - { VLC_FOURCC('s','h','r','n'), CODEC_ID_SHORTEN, - AUDIO_ES, "Shorten Lossless Audio" }, -#endif + { VLC_CODEC_SHORTEN, CODEC_ID_SHORTEN, AUDIO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 16, 0 ) - { VLC_FOURCC('w','v','p','k'), CODEC_ID_WAVPACK, - AUDIO_ES, "WavPack" }, - { VLC_FOURCC('W','V','P','K'), CODEC_ID_WAVPACK, - AUDIO_ES, "WavPack" }, -#endif + { VLC_CODEC_WAVPACK, CODEC_ID_WAVPACK, AUDIO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 34, 0 ) - { VLC_FOURCC('g','s','m',' '), CODEC_ID_GSM, - AUDIO_ES, "GSM Audio" }, - { VLC_FOURCC('g','s','m','s'), CODEC_ID_GSM_MS, - AUDIO_ES, "Microsoft GSM Audio" }, -#endif + { VLC_CODEC_GSM, CODEC_ID_GSM, AUDIO_ES }, + { VLC_CODEC_GSM_MS, CODEC_ID_GSM_MS, AUDIO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 4 ) - { VLC_FOURCC('a','t','r','c'), CODEC_ID_ATRAC3, - AUDIO_ES, "atrac 3" }, - { VLC_FOURCC(0x70,0x2,0x0,0x0), CODEC_ID_ATRAC3, - AUDIO_ES, "atrac 3" }, -#endif + { VLC_CODEC_ATRAC3, CODEC_ID_ATRAC3, AUDIO_ES }, - { VLC_FOURCC('S','O','N','C'), CODEC_ID_SONIC, - AUDIO_ES, "Sonic" }, + { VLC_CODEC_SONIC, CODEC_ID_SONIC, AUDIO_ES }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 34, 0 ) - { VLC_FOURCC(0x1,0x4,0x0,0x0), CODEC_ID_IMC, - AUDIO_ES, "IMC" }, + { VLC_CODEC_IMC, CODEC_ID_IMC, AUDIO_ES }, + { VLC_CODEC_TRUESPEECH, CODEC_ID_TRUESPEECH, AUDIO_ES }, + { VLC_CODEC_NELLYMOSER, CODEC_ID_NELLYMOSER, AUDIO_ES }, + { VLC_CODEC_APE, CODEC_ID_APE, AUDIO_ES }, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 58, 0 ) + { VLC_CODEC_MLP, CODEC_ID_MLP, AUDIO_ES }, #endif - { VLC_FOURCC(0x22,0x0,0x0,0x0), CODEC_ID_TRUESPEECH, - AUDIO_ES, "TrueSpeech" }, -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 46, 0 ) - { VLC_FOURCC('N','E','L','L'), CODEC_ID_NELLYMOSER, - AUDIO_ES, "NellyMoser ASAO" }, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 22, 0 ) + { VLC_CODEC_TRUEHD, CODEC_ID_TRUEHD, AUDIO_ES }, #endif -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 44, 0 ) - { VLC_FOURCC('A','P','E',' '), CODEC_ID_APE, - AUDIO_ES, "Monkey's Audio" }, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 6, 0 ) + { VLC_CODEC_QCELP, CODEC_ID_QCELP, AUDIO_ES }, #endif -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 58, 0 ) - { VLC_FOURCC('m','l','p',' '), CODEC_ID_MLP, - AUDIO_ES, "MLP/TrueHD Audio" }, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 50, 1 ) + { VLC_CODEC_SPEEX, CODEC_ID_SPEEX, AUDIO_ES }, #endif +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 34, 0 ) +#warning HERE + { VLC_CODEC_TWINVQ, CODEC_ID_TWINVQ, AUDIO_ES }, +#endif + /* PCM */ - { VLC_FOURCC('s','8',' ',' '), CODEC_ID_PCM_S8, - AUDIO_ES, "PCM S8" }, - { VLC_FOURCC('u','8',' ',' '), CODEC_ID_PCM_U8, - AUDIO_ES, "PCM U8" }, - { VLC_FOURCC('s','1','6','l'), CODEC_ID_PCM_S16LE, - AUDIO_ES, "PCM S16 LE" }, - { VLC_FOURCC('s','1','6','b'), CODEC_ID_PCM_S16BE, - AUDIO_ES, "PCM S16 BE" }, - { VLC_FOURCC('u','1','6','l'), CODEC_ID_PCM_U16LE, - AUDIO_ES, "PCM U16 LE" }, - { VLC_FOURCC('u','1','6','b'), CODEC_ID_PCM_U16BE, - AUDIO_ES, "PCM U16 BE" }, - { VLC_FOURCC('s','2','4','l'), CODEC_ID_PCM_S24LE, - AUDIO_ES, "PCM S24 LE" }, - { VLC_FOURCC('s','2','4','b'), CODEC_ID_PCM_S24BE, - AUDIO_ES, "PCM S24 BE" }, - { VLC_FOURCC('u','2','4','l'), CODEC_ID_PCM_U24LE, - AUDIO_ES, "PCM U24 LE" }, - { VLC_FOURCC('u','2','4','b'), CODEC_ID_PCM_U24BE, - AUDIO_ES, "PCM U24 BE" }, - { VLC_FOURCC('s','3','2','l'), CODEC_ID_PCM_S32LE, - AUDIO_ES, "PCM S32 LE" }, - { VLC_FOURCC('s','3','2','b'), CODEC_ID_PCM_S32BE, - AUDIO_ES, "PCM S32 BE" }, - { VLC_FOURCC('u','3','2','l'), CODEC_ID_PCM_U32LE, - AUDIO_ES, "PCM U32 LE" }, - { VLC_FOURCC('u','3','2','b'), CODEC_ID_PCM_U32BE, - AUDIO_ES, "PCM U32 BE" }, - { VLC_FOURCC('a','l','a','w'), CODEC_ID_PCM_ALAW, - AUDIO_ES, "PCM ALAW" }, - { VLC_FOURCC('u','l','a','w'), CODEC_ID_PCM_MULAW, - AUDIO_ES, "PCM ULAW" }, - { VLC_FOURCC('d','a','u','d'), CODEC_ID_PCM_S24DAUD, - AUDIO_ES, "PCM ULAW" }, + { VLC_CODEC_S8, CODEC_ID_PCM_S8, AUDIO_ES }, + { VLC_CODEC_U8, CODEC_ID_PCM_U8, AUDIO_ES }, + { VLC_CODEC_S16L, CODEC_ID_PCM_S16LE, AUDIO_ES }, + { VLC_CODEC_S16B, CODEC_ID_PCM_S16BE, AUDIO_ES }, + { VLC_CODEC_U16L, CODEC_ID_PCM_U16LE, AUDIO_ES }, + { VLC_CODEC_U16B, CODEC_ID_PCM_U16BE, AUDIO_ES }, + { VLC_CODEC_S24L, CODEC_ID_PCM_S24LE, AUDIO_ES }, + { VLC_CODEC_S24B, CODEC_ID_PCM_S24BE, AUDIO_ES }, + { VLC_CODEC_U24L, CODEC_ID_PCM_U24LE, AUDIO_ES }, + { VLC_CODEC_U24B, CODEC_ID_PCM_U24BE, AUDIO_ES }, + { VLC_CODEC_S32L, CODEC_ID_PCM_S32LE, AUDIO_ES }, + { VLC_CODEC_S32B, CODEC_ID_PCM_S32BE, AUDIO_ES }, + { VLC_CODEC_U32L, CODEC_ID_PCM_U32LE, AUDIO_ES }, + { VLC_CODEC_U32B, CODEC_ID_PCM_U32BE, AUDIO_ES }, + { VLC_CODEC_ALAW, CODEC_ID_PCM_ALAW, AUDIO_ES }, + { VLC_CODEC_MULAW, CODEC_ID_PCM_MULAW, AUDIO_ES }, + { VLC_CODEC_S24DAUD, CODEC_ID_PCM_S24DAUD, AUDIO_ES }, /* Subtitle streams */ -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 41, 0 ) /* Before this version, subs were too experimental */ - { VLC_FOURCC('s','p','u',' '), CODEC_ID_DVD_SUBTITLE, - SPU_ES, "DVD Subtitles" }, - { VLC_FOURCC('d','v','b','s'), CODEC_ID_DVB_SUBTITLE, - SPU_ES, "DVB Subtitles" }, - { VLC_FOURCC('s','u','b','t'), CODEC_ID_TEXT, - SPU_ES, "Plain text subtitles" }, - { VLC_FOURCC('x','s','u','b'), CODEC_ID_XSUB, - SPU_ES, "DivX XSUB subtitles" }, -#endif + { VLC_CODEC_SPU, CODEC_ID_DVD_SUBTITLE, SPU_ES }, + { VLC_CODEC_DVBS, CODEC_ID_DVB_SUBTITLE, SPU_ES }, + { VLC_CODEC_SUBT, CODEC_ID_TEXT, SPU_ES }, + { VLC_CODEC_XSUB, CODEC_ID_XSUB, SPU_ES }, #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 50, 0 ) - { VLC_FOURCC('s','s','a',' '), CODEC_ID_SSA, - SPU_ES, "SubStation Alpha subtitles" }, + { VLC_CODEC_SSA, CODEC_ID_SSA, SPU_ES }, #endif - { 0, 0, 0, "" } + { 0, 0, UNKNOWN_ES } }; int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat, int *pi_ffmpeg_codec, const char **ppsz_name ) { + i_fourcc = vlc_fourcc_GetCodec( UNKNOWN_ES, i_fourcc ); for( unsigned i = 0; codecs_table[i].i_fourcc != 0; i++ ) { if( codecs_table[i].i_fourcc == i_fourcc ) { if( pi_cat ) *pi_cat = codecs_table[i].i_cat; if( pi_ffmpeg_codec ) *pi_ffmpeg_codec = codecs_table[i].i_codec; - if( ppsz_name ) *ppsz_name = (char *)codecs_table[i].psz_name; + if( ppsz_name ) *ppsz_name = vlc_fourcc_GetDescription( UNKNOWN_ES, i_fourcc );//char *)codecs_table[i].psz_name; return true; } @@ -1108,7 +402,7 @@ int GetVlcFourcc( int i_ffmpeg_codec, int *pi_cat, { if( pi_cat ) *pi_cat = codecs_table[i].i_cat; if( pi_fourcc ) *pi_fourcc = codecs_table[i].i_fourcc; - if( ppsz_name ) *ppsz_name = codecs_table[i].psz_name; + if( ppsz_name ) *ppsz_name = vlc_fourcc_GetDescription( codecs_table[i].i_cat, codecs_table[i].i_fourcc ); return true; }