[vlc-commits] avcodec: remove category from codec tables
Rémi Denis-Courmont
git at videolan.org
Sat Jun 17 17:32:00 CEST 2017
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jun 17 18:05:13 2017 +0300| [1e92d81507753342eceb70c766198641c30b5d99] | committer: Rémi Denis-Courmont
avcodec: remove category from codec tables
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e92d81507753342eceb70c766198641c30b5d99
---
modules/codec/avcodec/fourcc.c | 579 +++++++++++++++++++++--------------------
1 file changed, 294 insertions(+), 285 deletions(-)
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 58770b7dad..ec8ccc1069 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -40,7 +40,6 @@ struct vlc_avcodec_fourcc
{
vlc_fourcc_t i_fourcc;
unsigned i_codec;
- int i_cat;
};
/*
@@ -48,213 +47,213 @@ struct vlc_avcodec_fourcc
*/
static const struct vlc_avcodec_fourcc video_codecs[] =
{
- { VLC_CODEC_MP2V, AV_CODEC_ID_MPEG2VIDEO, VIDEO_ES }, /* prefer MPEG2 over MPEG1 */
- { VLC_CODEC_MPGV, AV_CODEC_ID_MPEG2VIDEO, VIDEO_ES }, /* prefer MPEG2 over MPEG1 */
- { VLC_CODEC_MP1V, AV_CODEC_ID_MPEG1VIDEO, VIDEO_ES },
+ { VLC_CODEC_MP2V, AV_CODEC_ID_MPEG2VIDEO }, /* prefer MPEG2 over MPEG1 */
+ { VLC_CODEC_MPGV, AV_CODEC_ID_MPEG2VIDEO }, /* prefer MPEG2 over MPEG1 */
+ { VLC_CODEC_MP1V, AV_CODEC_ID_MPEG1VIDEO },
/* AV_CODEC_ID_MPEG2VIDEO_XVMC */
- { VLC_CODEC_H261, AV_CODEC_ID_H261, VIDEO_ES },
- { VLC_CODEC_H263, AV_CODEC_ID_H263, VIDEO_ES },
- { VLC_CODEC_RV10, AV_CODEC_ID_RV10, VIDEO_ES },
- { VLC_CODEC_RV13, AV_CODEC_ID_RV10, VIDEO_ES },
- { VLC_CODEC_RV20, AV_CODEC_ID_RV20, VIDEO_ES },
- { VLC_CODEC_MJPG, AV_CODEC_ID_MJPEG, VIDEO_ES },
- { VLC_CODEC_MJPGB, AV_CODEC_ID_MJPEGB,VIDEO_ES },
- { VLC_CODEC_LJPG, AV_CODEC_ID_LJPEG, VIDEO_ES },
- { VLC_CODEC_SP5X, AV_CODEC_ID_SP5X, VIDEO_ES },
- { VLC_CODEC_JPEGLS, AV_CODEC_ID_JPEGLS, VIDEO_ES },
- { VLC_CODEC_MP4V, AV_CODEC_ID_MPEG4, VIDEO_ES },
+ { VLC_CODEC_H261, AV_CODEC_ID_H261 },
+ { VLC_CODEC_H263, AV_CODEC_ID_H263 },
+ { VLC_CODEC_RV10, AV_CODEC_ID_RV10 },
+ { VLC_CODEC_RV13, AV_CODEC_ID_RV10 },
+ { VLC_CODEC_RV20, AV_CODEC_ID_RV20 },
+ { VLC_CODEC_MJPG, AV_CODEC_ID_MJPEG },
+ { VLC_CODEC_MJPGB, AV_CODEC_ID_MJPEGB },
+ { VLC_CODEC_LJPG, AV_CODEC_ID_LJPEG },
+ { VLC_CODEC_SP5X, AV_CODEC_ID_SP5X },
+ { VLC_CODEC_JPEGLS, AV_CODEC_ID_JPEGLS },
+ { VLC_CODEC_MP4V, AV_CODEC_ID_MPEG4 },
/* AV_CODEC_ID_RAWVIDEO */
- { VLC_CODEC_DIV1, AV_CODEC_ID_MSMPEG4V1, VIDEO_ES },
- { VLC_CODEC_DIV2, AV_CODEC_ID_MSMPEG4V2, VIDEO_ES },
- { VLC_CODEC_DIV3, AV_CODEC_ID_MSMPEG4V3, VIDEO_ES },
- { VLC_CODEC_WMV1, AV_CODEC_ID_WMV1, VIDEO_ES },
- { VLC_CODEC_WMV2, AV_CODEC_ID_WMV2, VIDEO_ES },
- { VLC_CODEC_H263P, AV_CODEC_ID_H263P, VIDEO_ES },
- { VLC_CODEC_H263I, AV_CODEC_ID_H263I, VIDEO_ES },
- { VLC_CODEC_FLV1, AV_CODEC_ID_FLV1, VIDEO_ES },
- { VLC_CODEC_SVQ1, AV_CODEC_ID_SVQ1, VIDEO_ES },
- { VLC_CODEC_SVQ3, AV_CODEC_ID_SVQ3, VIDEO_ES },
- { VLC_CODEC_DV, AV_CODEC_ID_DVVIDEO, VIDEO_ES },
- { VLC_CODEC_HUFFYUV, AV_CODEC_ID_HUFFYUV, VIDEO_ES },
- { VLC_CODEC_CYUV, AV_CODEC_ID_CYUV, VIDEO_ES },
- { VLC_CODEC_H264, AV_CODEC_ID_H264, VIDEO_ES },
- { VLC_CODEC_INDEO3, AV_CODEC_ID_INDEO3, VIDEO_ES },
- { VLC_CODEC_VP3, AV_CODEC_ID_VP3, VIDEO_ES },
- { VLC_CODEC_THEORA, AV_CODEC_ID_THEORA, VIDEO_ES },
+ { VLC_CODEC_DIV1, AV_CODEC_ID_MSMPEG4V1 },
+ { VLC_CODEC_DIV2, AV_CODEC_ID_MSMPEG4V2 },
+ { VLC_CODEC_DIV3, AV_CODEC_ID_MSMPEG4V3 },
+ { VLC_CODEC_WMV1, AV_CODEC_ID_WMV1 },
+ { VLC_CODEC_WMV2, AV_CODEC_ID_WMV2 },
+ { VLC_CODEC_H263P, AV_CODEC_ID_H263P },
+ { VLC_CODEC_H263I, AV_CODEC_ID_H263I },
+ { VLC_CODEC_FLV1, AV_CODEC_ID_FLV1 },
+ { VLC_CODEC_SVQ1, AV_CODEC_ID_SVQ1 },
+ { VLC_CODEC_SVQ3, AV_CODEC_ID_SVQ3 },
+ { VLC_CODEC_DV, AV_CODEC_ID_DVVIDEO },
+ { VLC_CODEC_HUFFYUV, AV_CODEC_ID_HUFFYUV },
+ { VLC_CODEC_CYUV, AV_CODEC_ID_CYUV },
+ { VLC_CODEC_H264, AV_CODEC_ID_H264 },
+ { VLC_CODEC_INDEO3, AV_CODEC_ID_INDEO3 },
+ { VLC_CODEC_VP3, AV_CODEC_ID_VP3 },
+ { VLC_CODEC_THEORA, AV_CODEC_ID_THEORA },
#if ( !defined( WORDS_BIGENDIAN ) )
/* Asus Video (Another thing that doesn't work on PPC) */
- { VLC_CODEC_ASV1, AV_CODEC_ID_ASV1, VIDEO_ES },
- { VLC_CODEC_ASV2, AV_CODEC_ID_ASV2, VIDEO_ES },
+ { VLC_CODEC_ASV1, AV_CODEC_ID_ASV1 },
+ { VLC_CODEC_ASV2, AV_CODEC_ID_ASV2 },
#endif
- { VLC_CODEC_FFV1, AV_CODEC_ID_FFV1, VIDEO_ES },
- { VLC_CODEC_4XM, AV_CODEC_ID_4XM, VIDEO_ES },
- { VLC_CODEC_VCR1, AV_CODEC_ID_VCR1, VIDEO_ES },
- { VLC_CODEC_CLJR, AV_CODEC_ID_CLJR, VIDEO_ES },
- { VLC_CODEC_MDEC, AV_CODEC_ID_MDEC, VIDEO_ES },
- { VLC_CODEC_ROQ, AV_CODEC_ID_ROQ, VIDEO_ES },
- { VLC_CODEC_INTERPLAY, AV_CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },
- { VLC_CODEC_XAN_WC3, AV_CODEC_ID_XAN_WC3, VIDEO_ES },
- { VLC_CODEC_XAN_WC4, AV_CODEC_ID_XAN_WC4, VIDEO_ES },
- { VLC_CODEC_RPZA, AV_CODEC_ID_RPZA, VIDEO_ES },
- { VLC_CODEC_CINEPAK, AV_CODEC_ID_CINEPAK, VIDEO_ES },
- { VLC_CODEC_WS_VQA, AV_CODEC_ID_WS_VQA, VIDEO_ES },
- { VLC_CODEC_MSRLE, AV_CODEC_ID_MSRLE, VIDEO_ES },
- { VLC_CODEC_MSVIDEO1, AV_CODEC_ID_MSVIDEO1, VIDEO_ES },
- { VLC_CODEC_IDCIN, AV_CODEC_ID_IDCIN, VIDEO_ES },
- { VLC_CODEC_8BPS, AV_CODEC_ID_8BPS, VIDEO_ES },
- { VLC_CODEC_SMC, AV_CODEC_ID_SMC, VIDEO_ES },
- { VLC_CODEC_FLIC, AV_CODEC_ID_FLIC, VIDEO_ES },
- { VLC_CODEC_TRUEMOTION1, AV_CODEC_ID_TRUEMOTION1, VIDEO_ES },
- { VLC_CODEC_VMDVIDEO, AV_CODEC_ID_VMDVIDEO, VIDEO_ES },
- { VLC_CODEC_LCL_MSZH, AV_CODEC_ID_MSZH, VIDEO_ES },
- { VLC_CODEC_LCL_ZLIB, AV_CODEC_ID_ZLIB, VIDEO_ES },
- { VLC_CODEC_QTRLE, AV_CODEC_ID_QTRLE, VIDEO_ES },
- { VLC_CODEC_TSCC, AV_CODEC_ID_TSCC, VIDEO_ES },
- { VLC_CODEC_ULTI, AV_CODEC_ID_ULTI, VIDEO_ES },
- { VLC_CODEC_QDRAW, AV_CODEC_ID_QDRAW, VIDEO_ES },
- { VLC_CODEC_VIXL, AV_CODEC_ID_VIXL, VIDEO_ES },
- { VLC_CODEC_QPEG, AV_CODEC_ID_QPEG, VIDEO_ES },
- { VLC_CODEC_PNG, AV_CODEC_ID_PNG, VIDEO_ES },
- { VLC_CODEC_PPM, AV_CODEC_ID_PPM, VIDEO_ES },
+ { VLC_CODEC_FFV1, AV_CODEC_ID_FFV1 },
+ { VLC_CODEC_4XM, AV_CODEC_ID_4XM },
+ { VLC_CODEC_VCR1, AV_CODEC_ID_VCR1 },
+ { VLC_CODEC_CLJR, AV_CODEC_ID_CLJR },
+ { VLC_CODEC_MDEC, AV_CODEC_ID_MDEC },
+ { VLC_CODEC_ROQ, AV_CODEC_ID_ROQ },
+ { VLC_CODEC_INTERPLAY, AV_CODEC_ID_INTERPLAY_VIDEO },
+ { VLC_CODEC_XAN_WC3, AV_CODEC_ID_XAN_WC3 },
+ { VLC_CODEC_XAN_WC4, AV_CODEC_ID_XAN_WC4 },
+ { VLC_CODEC_RPZA, AV_CODEC_ID_RPZA },
+ { VLC_CODEC_CINEPAK, AV_CODEC_ID_CINEPAK },
+ { VLC_CODEC_WS_VQA, AV_CODEC_ID_WS_VQA },
+ { VLC_CODEC_MSRLE, AV_CODEC_ID_MSRLE },
+ { VLC_CODEC_MSVIDEO1, AV_CODEC_ID_MSVIDEO1 },
+ { VLC_CODEC_IDCIN, AV_CODEC_ID_IDCIN },
+ { VLC_CODEC_8BPS, AV_CODEC_ID_8BPS },
+ { VLC_CODEC_SMC, AV_CODEC_ID_SMC },
+ { VLC_CODEC_FLIC, AV_CODEC_ID_FLIC },
+ { VLC_CODEC_TRUEMOTION1, AV_CODEC_ID_TRUEMOTION1 },
+ { VLC_CODEC_VMDVIDEO, AV_CODEC_ID_VMDVIDEO },
+ { VLC_CODEC_LCL_MSZH, AV_CODEC_ID_MSZH },
+ { VLC_CODEC_LCL_ZLIB, AV_CODEC_ID_ZLIB },
+ { VLC_CODEC_QTRLE, AV_CODEC_ID_QTRLE },
+ { VLC_CODEC_TSCC, AV_CODEC_ID_TSCC },
+ { VLC_CODEC_ULTI, AV_CODEC_ID_ULTI },
+ { VLC_CODEC_QDRAW, AV_CODEC_ID_QDRAW },
+ { VLC_CODEC_VIXL, AV_CODEC_ID_VIXL },
+ { VLC_CODEC_QPEG, AV_CODEC_ID_QPEG },
+ { VLC_CODEC_PNG, AV_CODEC_ID_PNG },
+ { VLC_CODEC_PPM, AV_CODEC_ID_PPM },
/* AV_CODEC_ID_PBM */
- { VLC_CODEC_PGM, AV_CODEC_ID_PGM, VIDEO_ES },
- { VLC_CODEC_PGMYUV, AV_CODEC_ID_PGMYUV, VIDEO_ES },
- { VLC_CODEC_PAM, AV_CODEC_ID_PAM, VIDEO_ES },
- { VLC_CODEC_FFVHUFF, AV_CODEC_ID_FFVHUFF, VIDEO_ES },
- { VLC_CODEC_RV30, AV_CODEC_ID_RV30, VIDEO_ES },
- { VLC_CODEC_RV40, AV_CODEC_ID_RV40, VIDEO_ES },
- { VLC_CODEC_VC1, AV_CODEC_ID_VC1, VIDEO_ES },
- { VLC_CODEC_WMVA, AV_CODEC_ID_VC1, VIDEO_ES },
- { VLC_CODEC_WMV3, AV_CODEC_ID_WMV3, VIDEO_ES },
- { VLC_CODEC_WMVP, AV_CODEC_ID_WMV3, VIDEO_ES },
- { VLC_CODEC_LOCO, AV_CODEC_ID_LOCO, VIDEO_ES },
- { VLC_CODEC_WNV1, AV_CODEC_ID_WNV1, VIDEO_ES },
- { VLC_CODEC_AASC, AV_CODEC_ID_AASC, VIDEO_ES },
- { VLC_CODEC_INDEO2, AV_CODEC_ID_INDEO2, VIDEO_ES },
- { VLC_CODEC_FRAPS, AV_CODEC_ID_FRAPS, VIDEO_ES },
- { VLC_CODEC_TRUEMOTION2, AV_CODEC_ID_TRUEMOTION2, VIDEO_ES },
- { VLC_CODEC_BMP, AV_CODEC_ID_BMP, VIDEO_ES },
- { VLC_CODEC_CSCD, AV_CODEC_ID_CSCD, VIDEO_ES },
- { VLC_CODEC_MMVIDEO, AV_CODEC_ID_MMVIDEO, VIDEO_ES },
- { VLC_CODEC_ZMBV, AV_CODEC_ID_ZMBV, VIDEO_ES },
- { VLC_CODEC_AVS, AV_CODEC_ID_AVS, VIDEO_ES },
- { VLC_CODEC_SMACKVIDEO, AV_CODEC_ID_SMACKVIDEO, VIDEO_ES },
- { VLC_CODEC_NUV, AV_CODEC_ID_NUV, VIDEO_ES },
- { VLC_CODEC_KMVC, AV_CODEC_ID_KMVC, VIDEO_ES },
- { VLC_CODEC_FLASHSV, AV_CODEC_ID_FLASHSV, VIDEO_ES },
- { VLC_CODEC_CAVS, AV_CODEC_ID_CAVS, VIDEO_ES },
- { VLC_CODEC_JPEG2000, AV_CODEC_ID_JPEG2000, VIDEO_ES },
- { VLC_CODEC_VMNC, AV_CODEC_ID_VMNC, VIDEO_ES },
- { VLC_CODEC_VP5, AV_CODEC_ID_VP5, VIDEO_ES },
- { VLC_CODEC_VP6, AV_CODEC_ID_VP6, VIDEO_ES },
- { VLC_CODEC_VP6F, AV_CODEC_ID_VP6F, VIDEO_ES },
- { VLC_CODEC_TARGA, AV_CODEC_ID_TARGA, VIDEO_ES },
- { VLC_CODEC_DSICINVIDEO, AV_CODEC_ID_DSICINVIDEO, VIDEO_ES },
- { VLC_CODEC_TIERTEXSEQVIDEO, AV_CODEC_ID_TIERTEXSEQVIDEO, VIDEO_ES },
- { VLC_CODEC_TIFF, AV_CODEC_ID_TIFF, VIDEO_ES },
- { VLC_CODEC_GIF, AV_CODEC_ID_GIF, VIDEO_ES },
- { VLC_CODEC_DXA, AV_CODEC_ID_DXA, VIDEO_ES },
- { VLC_CODEC_DNXHD, AV_CODEC_ID_DNXHD, VIDEO_ES },
- { VLC_CODEC_THP, AV_CODEC_ID_THP, VIDEO_ES },
- { VLC_CODEC_SGI, AV_CODEC_ID_SGI, VIDEO_ES },
- { VLC_CODEC_C93, AV_CODEC_ID_C93, VIDEO_ES },
- { VLC_CODEC_BETHSOFTVID, AV_CODEC_ID_BETHSOFTVID, VIDEO_ES },
+ { VLC_CODEC_PGM, AV_CODEC_ID_PGM },
+ { VLC_CODEC_PGMYUV, AV_CODEC_ID_PGMYUV },
+ { VLC_CODEC_PAM, AV_CODEC_ID_PAM },
+ { VLC_CODEC_FFVHUFF, AV_CODEC_ID_FFVHUFF },
+ { VLC_CODEC_RV30, AV_CODEC_ID_RV30 },
+ { VLC_CODEC_RV40, AV_CODEC_ID_RV40 },
+ { VLC_CODEC_VC1, AV_CODEC_ID_VC1 },
+ { VLC_CODEC_WMVA, AV_CODEC_ID_VC1 },
+ { VLC_CODEC_WMV3, AV_CODEC_ID_WMV3 },
+ { VLC_CODEC_WMVP, AV_CODEC_ID_WMV3 },
+ { VLC_CODEC_LOCO, AV_CODEC_ID_LOCO },
+ { VLC_CODEC_WNV1, AV_CODEC_ID_WNV1 },
+ { VLC_CODEC_AASC, AV_CODEC_ID_AASC },
+ { VLC_CODEC_INDEO2, AV_CODEC_ID_INDEO2 },
+ { VLC_CODEC_FRAPS, AV_CODEC_ID_FRAPS },
+ { VLC_CODEC_TRUEMOTION2, AV_CODEC_ID_TRUEMOTION2 },
+ { VLC_CODEC_BMP, AV_CODEC_ID_BMP },
+ { VLC_CODEC_CSCD, AV_CODEC_ID_CSCD },
+ { VLC_CODEC_MMVIDEO, AV_CODEC_ID_MMVIDEO },
+ { VLC_CODEC_ZMBV, AV_CODEC_ID_ZMBV },
+ { VLC_CODEC_AVS, AV_CODEC_ID_AVS },
+ { VLC_CODEC_SMACKVIDEO, AV_CODEC_ID_SMACKVIDEO },
+ { VLC_CODEC_NUV, AV_CODEC_ID_NUV },
+ { VLC_CODEC_KMVC, AV_CODEC_ID_KMVC },
+ { VLC_CODEC_FLASHSV, AV_CODEC_ID_FLASHSV },
+ { VLC_CODEC_CAVS, AV_CODEC_ID_CAVS },
+ { VLC_CODEC_JPEG2000, AV_CODEC_ID_JPEG2000 },
+ { VLC_CODEC_VMNC, AV_CODEC_ID_VMNC },
+ { VLC_CODEC_VP5, AV_CODEC_ID_VP5 },
+ { VLC_CODEC_VP6, AV_CODEC_ID_VP6 },
+ { VLC_CODEC_VP6F, AV_CODEC_ID_VP6F },
+ { VLC_CODEC_TARGA, AV_CODEC_ID_TARGA },
+ { VLC_CODEC_DSICINVIDEO, AV_CODEC_ID_DSICINVIDEO },
+ { VLC_CODEC_TIERTEXSEQVIDEO, AV_CODEC_ID_TIERTEXSEQVIDEO },
+ { VLC_CODEC_TIFF, AV_CODEC_ID_TIFF },
+ { VLC_CODEC_GIF, AV_CODEC_ID_GIF },
+ { VLC_CODEC_DXA, AV_CODEC_ID_DXA },
+ { VLC_CODEC_DNXHD, AV_CODEC_ID_DNXHD },
+ { VLC_CODEC_THP, AV_CODEC_ID_THP },
+ { VLC_CODEC_SGI, AV_CODEC_ID_SGI },
+ { VLC_CODEC_C93, AV_CODEC_ID_C93 },
+ { VLC_CODEC_BETHSOFTVID, AV_CODEC_ID_BETHSOFTVID },
/* AV_CODEC_ID_PTX */
- { VLC_CODEC_TXD, AV_CODEC_ID_TXD, VIDEO_ES },
- { VLC_CODEC_VP6A, AV_CODEC_ID_VP6A, VIDEO_ES },
- { VLC_CODEC_AMV, AV_CODEC_ID_AMV, VIDEO_ES },
- { VLC_CODEC_VB, AV_CODEC_ID_VB, VIDEO_ES },
- { VLC_CODEC_PCX, AV_CODEC_ID_PCX, VIDEO_ES },
+ { VLC_CODEC_TXD, AV_CODEC_ID_TXD },
+ { VLC_CODEC_VP6A, AV_CODEC_ID_VP6A },
+ { VLC_CODEC_AMV, AV_CODEC_ID_AMV },
+ { VLC_CODEC_VB, AV_CODEC_ID_VB },
+ { VLC_CODEC_PCX, AV_CODEC_ID_PCX },
/* AV_CODEC_ID_SUNRAST */
- { VLC_CODEC_INDEO4, AV_CODEC_ID_INDEO4, VIDEO_ES },
- { VLC_CODEC_INDEO5, AV_CODEC_ID_INDEO5, VIDEO_ES },
- { VLC_CODEC_MIMIC, AV_CODEC_ID_MIMIC, VIDEO_ES },
- { VLC_CODEC_RL2, AV_CODEC_ID_RL2, VIDEO_ES },
- { VLC_CODEC_ESCAPE124, AV_CODEC_ID_ESCAPE124, VIDEO_ES },
- { VLC_CODEC_DIRAC, AV_CODEC_ID_DIRAC, VIDEO_ES },
- { VLC_CODEC_BFI, AV_CODEC_ID_BFI, VIDEO_ES },
- { VLC_CODEC_CMV, AV_CODEC_ID_CMV, VIDEO_ES },
- { VLC_CODEC_MOTIONPIXELS, AV_CODEC_ID_MOTIONPIXELS, VIDEO_ES },
- { VLC_CODEC_TGV, AV_CODEC_ID_TGV, VIDEO_ES },
- { VLC_CODEC_TGQ, AV_CODEC_ID_TGQ, VIDEO_ES },
- { VLC_CODEC_TQI, AV_CODEC_ID_TQI, VIDEO_ES },
- { VLC_CODEC_AURA, AV_CODEC_ID_AURA, VIDEO_ES },
+ { VLC_CODEC_INDEO4, AV_CODEC_ID_INDEO4 },
+ { VLC_CODEC_INDEO5, AV_CODEC_ID_INDEO5 },
+ { VLC_CODEC_MIMIC, AV_CODEC_ID_MIMIC },
+ { VLC_CODEC_RL2, AV_CODEC_ID_RL2 },
+ { VLC_CODEC_ESCAPE124, AV_CODEC_ID_ESCAPE124 },
+ { VLC_CODEC_DIRAC, AV_CODEC_ID_DIRAC },
+ { VLC_CODEC_BFI, AV_CODEC_ID_BFI },
+ { VLC_CODEC_CMV, AV_CODEC_ID_CMV },
+ { VLC_CODEC_MOTIONPIXELS, AV_CODEC_ID_MOTIONPIXELS },
+ { VLC_CODEC_TGV, AV_CODEC_ID_TGV },
+ { VLC_CODEC_TGQ, AV_CODEC_ID_TGQ },
+ { VLC_CODEC_TQI, AV_CODEC_ID_TQI },
+ { VLC_CODEC_AURA, AV_CODEC_ID_AURA },
/* AV_CODEC_ID_AURA2 */
/* AV_CODEC_ID_V210X */
- { VLC_CODEC_TMV, AV_CODEC_ID_TMV, VIDEO_ES },
- { VLC_CODEC_V210, AV_CODEC_ID_V210, VIDEO_ES },
+ { VLC_CODEC_TMV, AV_CODEC_ID_TMV },
+ { VLC_CODEC_V210, AV_CODEC_ID_V210 },
/* AV_CODEC_ID_DPX */
- { VLC_CODEC_MAD, AV_CODEC_ID_MAD, VIDEO_ES },
- { VLC_CODEC_FRWU, AV_CODEC_ID_FRWU, VIDEO_ES },
- { VLC_CODEC_FLASHSV2, AV_CODEC_ID_FLASHSV2, VIDEO_ES },
+ { VLC_CODEC_MAD, AV_CODEC_ID_MAD },
+ { VLC_CODEC_FRWU, AV_CODEC_ID_FRWU },
+ { VLC_CODEC_FLASHSV2, AV_CODEC_ID_FLASHSV2 },
/* AV_CODEC_ID_CDGRAPHICS */
/* AV_CODEC_ID_R210 */
- { VLC_CODEC_ANM, AV_CODEC_ID_ANM, VIDEO_ES },
- { VLC_CODEC_BINKVIDEO, AV_CODEC_ID_BINKVIDEO, VIDEO_ES },
+ { VLC_CODEC_ANM, AV_CODEC_ID_ANM },
+ { VLC_CODEC_BINKVIDEO, AV_CODEC_ID_BINKVIDEO },
/* AV_CODEC_ID_IFF_ILBM */
/* AV_CODEC_ID_IFF_BYTERUN1 */
- { VLC_CODEC_KGV1, AV_CODEC_ID_KGV1, VIDEO_ES },
- { VLC_CODEC_YOP, AV_CODEC_ID_YOP, VIDEO_ES },
- { VLC_CODEC_VP8, AV_CODEC_ID_VP8, VIDEO_ES },
+ { VLC_CODEC_KGV1, AV_CODEC_ID_KGV1 },
+ { VLC_CODEC_YOP, AV_CODEC_ID_YOP },
+ { VLC_CODEC_VP8, AV_CODEC_ID_VP8 },
/* AV_CODEC_ID_PICTOR */
/* AV_CODEC_ID_ANSI */
/* AV_CODEC_ID_A64_MULTI */
/* AV_CODEC_ID_A64_MULTI5 */
/* AV_CODEC_ID_R10K */
- { VLC_CODEC_MXPEG, AV_CODEC_ID_MXPEG, VIDEO_ES },
- { VLC_CODEC_LAGARITH, AV_CODEC_ID_LAGARITH, VIDEO_ES },
- { VLC_CODEC_PRORES, AV_CODEC_ID_PRORES, VIDEO_ES },
- { VLC_CODEC_JV, AV_CODEC_ID_JV, VIDEO_ES },
- { VLC_CODEC_DFA, AV_CODEC_ID_DFA, VIDEO_ES },
- { VLC_CODEC_WMVP, AV_CODEC_ID_WMV3IMAGE, VIDEO_ES },
- { VLC_CODEC_WMVP2, AV_CODEC_ID_VC1IMAGE, VIDEO_ES },
- { VLC_CODEC_UTVIDEO, AV_CODEC_ID_UTVIDEO, VIDEO_ES },
- { VLC_CODEC_BMVVIDEO, AV_CODEC_ID_BMV_VIDEO, VIDEO_ES },
- { VLC_CODEC_VBLE, AV_CODEC_ID_VBLE, VIDEO_ES },
- { VLC_CODEC_DXTORY, AV_CODEC_ID_DXTORY, VIDEO_ES },
+ { VLC_CODEC_MXPEG, AV_CODEC_ID_MXPEG },
+ { VLC_CODEC_LAGARITH, AV_CODEC_ID_LAGARITH },
+ { VLC_CODEC_PRORES, AV_CODEC_ID_PRORES },
+ { VLC_CODEC_JV, AV_CODEC_ID_JV },
+ { VLC_CODEC_DFA, AV_CODEC_ID_DFA },
+ { VLC_CODEC_WMVP, AV_CODEC_ID_WMV3IMAGE },
+ { VLC_CODEC_WMVP2, AV_CODEC_ID_VC1IMAGE },
+ { VLC_CODEC_UTVIDEO, AV_CODEC_ID_UTVIDEO },
+ { VLC_CODEC_BMVVIDEO, AV_CODEC_ID_BMV_VIDEO },
+ { VLC_CODEC_VBLE, AV_CODEC_ID_VBLE },
+ { VLC_CODEC_DXTORY, AV_CODEC_ID_DXTORY },
/* AV_CODEC_ID_V410 */
/* AV_CODEC_ID_XWD */
- { VLC_CODEC_CDXL, AV_CODEC_ID_CDXL, VIDEO_ES },
+ { VLC_CODEC_CDXL, AV_CODEC_ID_CDXL },
/* AV_CODEC_ID_XBM */
/* AV_CODEC_ID_ZEROCODEC */
- { VLC_CODEC_MSS1, AV_CODEC_ID_MSS1, VIDEO_ES },
- { VLC_CODEC_MSA1, AV_CODEC_ID_MSA1, VIDEO_ES },
- { VLC_CODEC_TSC2, AV_CODEC_ID_TSCC2, VIDEO_ES },
- { VLC_CODEC_MTS2, AV_CODEC_ID_MTS2, VIDEO_ES },
- { VLC_CODEC_CLLC, AV_CODEC_ID_CLLC, VIDEO_ES },
- { VLC_CODEC_MSS2, AV_CODEC_ID_MSS2, VIDEO_ES },
- { VLC_CODEC_VP9, AV_CODEC_ID_VP9, VIDEO_ES },
- { VLC_CODEC_ICOD, AV_CODEC_ID_AIC, VIDEO_ES },
+ { VLC_CODEC_MSS1, AV_CODEC_ID_MSS1 },
+ { VLC_CODEC_MSA1, AV_CODEC_ID_MSA1 },
+ { VLC_CODEC_TSC2, AV_CODEC_ID_TSCC2 },
+ { VLC_CODEC_MTS2, AV_CODEC_ID_MTS2 },
+ { VLC_CODEC_CLLC, AV_CODEC_ID_CLLC },
+ { VLC_CODEC_MSS2, AV_CODEC_ID_MSS2 },
+ { VLC_CODEC_VP9, AV_CODEC_ID_VP9 },
+ { VLC_CODEC_ICOD, AV_CODEC_ID_AIC },
/* AV_CODEC_ID_ESCAPE130 */
- { VLC_CODEC_G2M4, AV_CODEC_ID_G2M, VIDEO_ES },
+ { VLC_CODEC_G2M4, AV_CODEC_ID_G2M },
/* AV_CODEC_ID_WEBP */
- { VLC_CODEC_HNM4_VIDEO, AV_CODEC_ID_HNM4_VIDEO, VIDEO_ES },
- { VLC_CODEC_HEVC, AV_CODEC_ID_HEVC, VIDEO_ES },
+ { VLC_CODEC_HNM4_VIDEO, AV_CODEC_ID_HNM4_VIDEO },
+ { VLC_CODEC_HEVC, AV_CODEC_ID_HEVC },
- { VLC_CODEC_FIC , AV_CODEC_ID_FIC, VIDEO_ES },
+ { VLC_CODEC_FIC , AV_CODEC_ID_FIC },
/* AV_CODEC_ID_ALIAS_PIX */
/* AV_CODEC_ID_BRENDER_PIX */
/* AV_CODEC_ID_PAF_VIDEO */
/* AV_CODEC_ID_EXR */
- { VLC_CODEC_VP7 , AV_CODEC_ID_VP7, VIDEO_ES },
+ { VLC_CODEC_VP7 , AV_CODEC_ID_VP7 },
/* AV_CODEC_ID_SANM */
/* AV_CODEC_ID_SGIRLE */
/* AV_CODEC_ID_MVC1 */
/* AV_CODEC_ID_MVC2 */
- { VLC_CODEC_HQX, AV_CODEC_ID_HQX, VIDEO_ES },
+ { VLC_CODEC_HQX, AV_CODEC_ID_HQX },
- { VLC_CODEC_TDSC, AV_CODEC_ID_TDSC, VIDEO_ES },
+ { VLC_CODEC_TDSC, AV_CODEC_ID_TDSC },
- { VLC_CODEC_HQ_HQA, AV_CODEC_ID_HQ_HQA, VIDEO_ES },
+ { VLC_CODEC_HQ_HQA, AV_CODEC_ID_HQ_HQA },
- { VLC_CODEC_HAP, AV_CODEC_ID_HAP, VIDEO_ES },
+ { VLC_CODEC_HAP, AV_CODEC_ID_HAP },
/* AV_CODEC_ID_DDS */
- { VLC_CODEC_DXV, AV_CODEC_ID_DXV, VIDEO_ES },
+ { VLC_CODEC_DXV, AV_CODEC_ID_DXV },
- { VLC_CODEC_G2M2, AV_CODEC_ID_G2M, VIDEO_ES },
- { VLC_CODEC_G2M3, AV_CODEC_ID_G2M, VIDEO_ES },
+ { VLC_CODEC_G2M2, AV_CODEC_ID_G2M },
+ { VLC_CODEC_G2M3, AV_CODEC_ID_G2M },
/* ffmpeg only: AV_CODEC_ID_BRENDER_PIX */
/* ffmpeg only: AV_CODEC_ID_Y41P */
@@ -279,15 +278,15 @@ static const struct vlc_avcodec_fourcc video_codecs[] =
/* ffmpeg only: AV_CODEC_ID_SMVJPEG */
#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 70, 100 )
- { VLC_CODEC_PIXLET, AV_CODEC_ID_PIXLET, VIDEO_ES },
+ { VLC_CODEC_PIXLET, AV_CODEC_ID_PIXLET },
#endif
#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 101 )
- { VLC_CODEC_SPEEDHQ, AV_CODEC_ID_SPEEDHQ, VIDEO_ES },
+ { VLC_CODEC_SPEEDHQ, AV_CODEC_ID_SPEEDHQ },
#endif
#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 79, 100 )
- { VLC_CODEC_FMVC, AV_CODEC_ID_FMVC, VIDEO_ES },
+ { VLC_CODEC_FMVC, AV_CODEC_ID_FMVC },
#endif
};
@@ -297,31 +296,31 @@ static const struct vlc_avcodec_fourcc video_codecs[] =
static const struct vlc_avcodec_fourcc audio_codecs[] =
{
/* PCM */
- { VLC_CODEC_S16L, AV_CODEC_ID_PCM_S16LE, AUDIO_ES },
- { VLC_CODEC_S16B, AV_CODEC_ID_PCM_S16BE, AUDIO_ES },
- { VLC_CODEC_U16L, AV_CODEC_ID_PCM_U16LE, AUDIO_ES },
- { VLC_CODEC_U16B, AV_CODEC_ID_PCM_U16BE, AUDIO_ES },
- { VLC_CODEC_S8, AV_CODEC_ID_PCM_S8, AUDIO_ES },
- { VLC_CODEC_U8, AV_CODEC_ID_PCM_U8, AUDIO_ES },
- { VLC_CODEC_MULAW, AV_CODEC_ID_PCM_MULAW, AUDIO_ES },
- { VLC_CODEC_ALAW, AV_CODEC_ID_PCM_ALAW, AUDIO_ES },
- { VLC_CODEC_S32L, AV_CODEC_ID_PCM_S32LE, AUDIO_ES },
- { VLC_CODEC_S32B, AV_CODEC_ID_PCM_S32BE, AUDIO_ES },
- { VLC_CODEC_U32L, AV_CODEC_ID_PCM_U32LE, AUDIO_ES },
- { VLC_CODEC_U32B, AV_CODEC_ID_PCM_U32BE, AUDIO_ES },
- { VLC_CODEC_S24L, AV_CODEC_ID_PCM_S24LE, AUDIO_ES },
- { VLC_CODEC_S24B, AV_CODEC_ID_PCM_S24BE, AUDIO_ES },
- { VLC_CODEC_U24L, AV_CODEC_ID_PCM_U24LE, AUDIO_ES },
- { VLC_CODEC_U24B, AV_CODEC_ID_PCM_U24BE, AUDIO_ES },
- { VLC_CODEC_S24DAUD, AV_CODEC_ID_PCM_S24DAUD, AUDIO_ES },
+ { VLC_CODEC_S16L, AV_CODEC_ID_PCM_S16LE },
+ { VLC_CODEC_S16B, AV_CODEC_ID_PCM_S16BE },
+ { VLC_CODEC_U16L, AV_CODEC_ID_PCM_U16LE },
+ { VLC_CODEC_U16B, AV_CODEC_ID_PCM_U16BE },
+ { VLC_CODEC_S8, AV_CODEC_ID_PCM_S8 },
+ { VLC_CODEC_U8, AV_CODEC_ID_PCM_U8 },
+ { VLC_CODEC_MULAW, AV_CODEC_ID_PCM_MULAW },
+ { VLC_CODEC_ALAW, AV_CODEC_ID_PCM_ALAW },
+ { VLC_CODEC_S32L, AV_CODEC_ID_PCM_S32LE },
+ { VLC_CODEC_S32B, AV_CODEC_ID_PCM_S32BE },
+ { VLC_CODEC_U32L, AV_CODEC_ID_PCM_U32LE },
+ { VLC_CODEC_U32B, AV_CODEC_ID_PCM_U32BE },
+ { VLC_CODEC_S24L, AV_CODEC_ID_PCM_S24LE },
+ { VLC_CODEC_S24B, AV_CODEC_ID_PCM_S24BE },
+ { VLC_CODEC_U24L, AV_CODEC_ID_PCM_U24LE },
+ { VLC_CODEC_U24B, AV_CODEC_ID_PCM_U24BE },
+ { VLC_CODEC_S24DAUD, AV_CODEC_ID_PCM_S24DAUD },
/* AV_CODEC_ID_PCM_ZORK */
- { VLC_CODEC_S16L_PLANAR, AV_CODEC_ID_PCM_S16LE_PLANAR, AUDIO_ES },
+ { VLC_CODEC_S16L_PLANAR, AV_CODEC_ID_PCM_S16LE_PLANAR },
/* AV_CODEC_ID_PCM_DVD */
- { VLC_CODEC_F32B, AV_CODEC_ID_PCM_F32BE, AUDIO_ES },
- { VLC_CODEC_F32L, AV_CODEC_ID_PCM_F32LE, AUDIO_ES },
- { VLC_CODEC_F64B, AV_CODEC_ID_PCM_F64BE, AUDIO_ES },
- { VLC_CODEC_F64L, AV_CODEC_ID_PCM_F64LE, AUDIO_ES },
- { VLC_CODEC_BD_LPCM, AV_CODEC_ID_PCM_BLURAY, AUDIO_ES },
+ { VLC_CODEC_F32B, AV_CODEC_ID_PCM_F32BE },
+ { VLC_CODEC_F32L, AV_CODEC_ID_PCM_F32LE },
+ { VLC_CODEC_F64B, AV_CODEC_ID_PCM_F64BE },
+ { VLC_CODEC_F64L, AV_CODEC_ID_PCM_F64LE },
+ { VLC_CODEC_BD_LPCM, AV_CODEC_ID_PCM_BLURAY },
/* AV_CODEC_ID_PCM_LXF */
/* AV_CODEC_ID_S302M */
/* AV_CODEC_ID_PCM_S8_PLANAR */
@@ -330,36 +329,36 @@ static const struct vlc_avcodec_fourcc audio_codecs[] =
/* ffmpeg only: AV_CODEC_ID_PCM_S16BE_PLANAR */
/* ADPCM */
- { VLC_CODEC_ADPCM_IMA_QT, AV_CODEC_ID_ADPCM_IMA_QT, AUDIO_ES },
- { VLC_CODEC_ADPCM_IMA_WAV, AV_CODEC_ID_ADPCM_IMA_WAV, AUDIO_ES },
+ { VLC_CODEC_ADPCM_IMA_QT, AV_CODEC_ID_ADPCM_IMA_QT },
+ { VLC_CODEC_ADPCM_IMA_WAV, AV_CODEC_ID_ADPCM_IMA_WAV },
/* AV_CODEC_ID_ADPCM_IMA_DK3 */
/* AV_CODEC_ID_ADPCM_IMA_DK4 */
- { VLC_CODEC_ADPCM_IMA_WS, AV_CODEC_ID_ADPCM_IMA_WS, AUDIO_ES },
+ { VLC_CODEC_ADPCM_IMA_WS, AV_CODEC_ID_ADPCM_IMA_WS },
/* AV_CODEC_ID_ADPCM_IMA_SMJPEG */
- { VLC_CODEC_ADPCM_MS, AV_CODEC_ID_ADPCM_MS, AUDIO_ES },
- { VLC_CODEC_ADPCM_4XM, AV_CODEC_ID_ADPCM_4XM, AUDIO_ES },
- { VLC_CODEC_ADPCM_XA, AV_CODEC_ID_ADPCM_XA, AUDIO_ES },
- { VLC_CODEC_ADPCM_ADX, AV_CODEC_ID_ADPCM_ADX, AUDIO_ES },
- { VLC_CODEC_ADPCM_EA, AV_CODEC_ID_ADPCM_EA, AUDIO_ES },
- { VLC_CODEC_ADPCM_G726, AV_CODEC_ID_ADPCM_G726, AUDIO_ES },
- { VLC_CODEC_ADPCM_CREATIVE, AV_CODEC_ID_ADPCM_CT, AUDIO_ES },
- { VLC_CODEC_ADPCM_SWF, AV_CODEC_ID_ADPCM_SWF, AUDIO_ES },
- { VLC_CODEC_ADPCM_YAMAHA, AV_CODEC_ID_ADPCM_YAMAHA, AUDIO_ES },
- { VLC_CODEC_ADPCM_SBPRO_4, AV_CODEC_ID_ADPCM_SBPRO_4, AUDIO_ES },
- { VLC_CODEC_ADPCM_SBPRO_3, AV_CODEC_ID_ADPCM_SBPRO_3, AUDIO_ES },
- { VLC_CODEC_ADPCM_SBPRO_2, AV_CODEC_ID_ADPCM_SBPRO_2, AUDIO_ES },
- { VLC_CODEC_ADPCM_THP, AV_CODEC_ID_ADPCM_THP, AUDIO_ES },
- { VLC_CODEC_ADPCM_IMA_AMV, AV_CODEC_ID_ADPCM_IMA_AMV, AUDIO_ES },
- { VLC_CODEC_ADPCM_EA_R1, AV_CODEC_ID_ADPCM_EA_R1, AUDIO_ES },
+ { VLC_CODEC_ADPCM_MS, AV_CODEC_ID_ADPCM_MS },
+ { VLC_CODEC_ADPCM_4XM, AV_CODEC_ID_ADPCM_4XM },
+ { VLC_CODEC_ADPCM_XA, AV_CODEC_ID_ADPCM_XA },
+ { VLC_CODEC_ADPCM_ADX, AV_CODEC_ID_ADPCM_ADX },
+ { VLC_CODEC_ADPCM_EA, AV_CODEC_ID_ADPCM_EA },
+ { VLC_CODEC_ADPCM_G726, AV_CODEC_ID_ADPCM_G726 },
+ { VLC_CODEC_ADPCM_CREATIVE, AV_CODEC_ID_ADPCM_CT },
+ { VLC_CODEC_ADPCM_SWF, AV_CODEC_ID_ADPCM_SWF },
+ { VLC_CODEC_ADPCM_YAMAHA, AV_CODEC_ID_ADPCM_YAMAHA },
+ { VLC_CODEC_ADPCM_SBPRO_4, AV_CODEC_ID_ADPCM_SBPRO_4 },
+ { VLC_CODEC_ADPCM_SBPRO_3, AV_CODEC_ID_ADPCM_SBPRO_3 },
+ { VLC_CODEC_ADPCM_SBPRO_2, AV_CODEC_ID_ADPCM_SBPRO_2 },
+ { VLC_CODEC_ADPCM_THP, AV_CODEC_ID_ADPCM_THP },
+ { VLC_CODEC_ADPCM_IMA_AMV, AV_CODEC_ID_ADPCM_IMA_AMV },
+ { VLC_CODEC_ADPCM_EA_R1, AV_CODEC_ID_ADPCM_EA_R1 },
/* AV_CODEC_ID_ADPCM_EA_R3 */
/* AV_CODEC_ID_ADPCM_EA_R2 */
- { VLC_CODEC_ADPCM_IMA_EA_SEAD, AV_CODEC_ID_ADPCM_IMA_EA_SEAD, AUDIO_ES },
+ { VLC_CODEC_ADPCM_IMA_EA_SEAD, AV_CODEC_ID_ADPCM_IMA_EA_SEAD },
/* AV_CODEC_ID_ADPCM_IMA_EA_EACS */
/* AV_CODEC_ID_ADPCM_EA_XAS */
/* AV_CODEC_ID_ADPCM_EA_MAXIS_XA */
/* AV_CODEC_ID_ADPCM_IMA_ISS */
- { VLC_CODEC_ADPCM_G722, AV_CODEC_ID_ADPCM_G722, AUDIO_ES },
- { VLC_CODEC_ADPCM_IMA_APC, AV_CODEC_ID_ADPCM_IMA_APC, AUDIO_ES },
+ { VLC_CODEC_ADPCM_G722, AV_CODEC_ID_ADPCM_G722 },
+ { VLC_CODEC_ADPCM_IMA_APC, AV_CODEC_ID_ADPCM_IMA_APC },
/* ffmpeg only: AV_CODEC_ID_VIMA */
/* ffmpeg only: AV_CODEC_ID_ADPCM_AFC */
/* ffmpeg only: AV_CODEC_ID_ADPCM_IMA_OKI */
@@ -368,90 +367,90 @@ static const struct vlc_avcodec_fourcc audio_codecs[] =
/* ffmpeg only: AV_CODEC_ID_ADPCM_G726LE */
/* AMR */
- { VLC_CODEC_AMR_NB, AV_CODEC_ID_AMR_NB, AUDIO_ES },
- { VLC_CODEC_AMR_WB, AV_CODEC_ID_AMR_WB, AUDIO_ES },
+ { VLC_CODEC_AMR_NB, AV_CODEC_ID_AMR_NB },
+ { VLC_CODEC_AMR_WB, AV_CODEC_ID_AMR_WB },
/* RealAudio */
- { VLC_CODEC_RA_144, AV_CODEC_ID_RA_144, AUDIO_ES },
- { VLC_CODEC_RA_288, AV_CODEC_ID_RA_288, AUDIO_ES },
+ { VLC_CODEC_RA_144, AV_CODEC_ID_RA_144 },
+ { VLC_CODEC_RA_288, AV_CODEC_ID_RA_288 },
/* DPCM */
- { VLC_CODEC_ROQ_DPCM, AV_CODEC_ID_ROQ_DPCM, AUDIO_ES },
- { VLC_CODEC_INTERPLAY_DPCM, AV_CODEC_ID_INTERPLAY_DPCM, AUDIO_ES },
+ { VLC_CODEC_ROQ_DPCM, AV_CODEC_ID_ROQ_DPCM },
+ { VLC_CODEC_INTERPLAY_DPCM, AV_CODEC_ID_INTERPLAY_DPCM },
/* AV_CODEC_ID_XAN_DPCM */
/* AV_CODEC_ID_SOL_DPCM */
/* audio codecs */
- { VLC_CODEC_MP3, AV_CODEC_ID_MP3, AUDIO_ES },
- { VLC_CODEC_MPGA, AV_CODEC_ID_MP2, AUDIO_ES },
- { VLC_CODEC_MP2, AV_CODEC_ID_MP2, AUDIO_ES },
- { VLC_CODEC_MP4A, AV_CODEC_ID_AAC, AUDIO_ES },
- { VLC_CODEC_A52, AV_CODEC_ID_AC3, AUDIO_ES },
- { VLC_CODEC_DTS, AV_CODEC_ID_DTS, AUDIO_ES },
- { VLC_CODEC_VORBIS, AV_CODEC_ID_VORBIS, AUDIO_ES },
- { VLC_CODEC_DVAUDIO, AV_CODEC_ID_DVAUDIO, AUDIO_ES },
- { VLC_CODEC_WMA1, AV_CODEC_ID_WMAV1, AUDIO_ES },
- { VLC_CODEC_WMA2, AV_CODEC_ID_WMAV2, AUDIO_ES },
- { VLC_CODEC_MACE3, AV_CODEC_ID_MACE3, AUDIO_ES },
- { VLC_CODEC_MACE6, AV_CODEC_ID_MACE6, AUDIO_ES },
- { VLC_CODEC_VMDAUDIO, AV_CODEC_ID_VMDAUDIO, AUDIO_ES },
- { VLC_CODEC_FLAC, AV_CODEC_ID_FLAC, AUDIO_ES },
+ { VLC_CODEC_MP3, AV_CODEC_ID_MP3 },
+ { VLC_CODEC_MPGA, AV_CODEC_ID_MP2 },
+ { VLC_CODEC_MP2, AV_CODEC_ID_MP2 },
+ { VLC_CODEC_MP4A, AV_CODEC_ID_AAC },
+ { VLC_CODEC_A52, AV_CODEC_ID_AC3 },
+ { VLC_CODEC_DTS, AV_CODEC_ID_DTS },
+ { VLC_CODEC_VORBIS, AV_CODEC_ID_VORBIS },
+ { VLC_CODEC_DVAUDIO, AV_CODEC_ID_DVAUDIO },
+ { VLC_CODEC_WMA1, AV_CODEC_ID_WMAV1 },
+ { VLC_CODEC_WMA2, AV_CODEC_ID_WMAV2 },
+ { VLC_CODEC_MACE3, AV_CODEC_ID_MACE3 },
+ { VLC_CODEC_MACE6, AV_CODEC_ID_MACE6 },
+ { VLC_CODEC_VMDAUDIO, AV_CODEC_ID_VMDAUDIO },
+ { VLC_CODEC_FLAC, AV_CODEC_ID_FLAC },
/* AV_CODEC_ID_MP3ADU */
/* AV_CODEC_ID_MP3ON4 */
- { VLC_CODEC_SHORTEN, AV_CODEC_ID_SHORTEN, AUDIO_ES },
- { VLC_CODEC_ALAC, AV_CODEC_ID_ALAC, AUDIO_ES },
+ { VLC_CODEC_SHORTEN, AV_CODEC_ID_SHORTEN },
+ { VLC_CODEC_ALAC, AV_CODEC_ID_ALAC },
/* AV_CODEC_ID_WESTWOOD_SND1 */
- { VLC_CODEC_GSM, AV_CODEC_ID_GSM, AUDIO_ES },
- { VLC_CODEC_QDM2, AV_CODEC_ID_QDM2, AUDIO_ES },
+ { VLC_CODEC_GSM, AV_CODEC_ID_GSM },
+ { VLC_CODEC_QDM2, AV_CODEC_ID_QDM2 },
#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 100 )
- { VLC_CODEC_QDMC, AV_CODEC_ID_QDMC, AUDIO_ES },
+ { VLC_CODEC_QDMC, AV_CODEC_ID_QDMC },
#endif
- { VLC_CODEC_COOK, AV_CODEC_ID_COOK, AUDIO_ES },
- { VLC_CODEC_TRUESPEECH, AV_CODEC_ID_TRUESPEECH, AUDIO_ES },
- { VLC_CODEC_TTA, AV_CODEC_ID_TTA, AUDIO_ES },
- { VLC_CODEC_SMACKAUDIO, AV_CODEC_ID_SMACKAUDIO, AUDIO_ES },
- { VLC_CODEC_QCELP, AV_CODEC_ID_QCELP, AUDIO_ES },
- { VLC_CODEC_WAVPACK, AV_CODEC_ID_WAVPACK, AUDIO_ES },
- { VLC_CODEC_DSICINAUDIO, AV_CODEC_ID_DSICINAUDIO, AUDIO_ES },
- { VLC_CODEC_IMC, AV_CODEC_ID_IMC, AUDIO_ES },
- { VLC_CODEC_MUSEPACK7, AV_CODEC_ID_MUSEPACK7, AUDIO_ES },
- { VLC_CODEC_MLP, AV_CODEC_ID_MLP, AUDIO_ES },
- { VLC_CODEC_GSM_MS, AV_CODEC_ID_GSM_MS, AUDIO_ES },
- { VLC_CODEC_ATRAC3, AV_CODEC_ID_ATRAC3, AUDIO_ES },
- { VLC_CODEC_APE, AV_CODEC_ID_APE, AUDIO_ES },
- { VLC_CODEC_NELLYMOSER, AV_CODEC_ID_NELLYMOSER, AUDIO_ES },
- { VLC_CODEC_MUSEPACK8, AV_CODEC_ID_MUSEPACK8, AUDIO_ES },
- { VLC_CODEC_SPEEX, AV_CODEC_ID_SPEEX, AUDIO_ES },
- { VLC_CODEC_WMAS, AV_CODEC_ID_WMAVOICE, AUDIO_ES },
- { VLC_CODEC_WMAP, AV_CODEC_ID_WMAPRO, AUDIO_ES },
- { VLC_CODEC_WMAL, AV_CODEC_ID_WMALOSSLESS, AUDIO_ES },
- { VLC_CODEC_ATRAC3P, AV_CODEC_ID_ATRAC3P, AUDIO_ES },
- { VLC_CODEC_EAC3, AV_CODEC_ID_EAC3, AUDIO_ES },
- { VLC_CODEC_SIPR, AV_CODEC_ID_SIPR, AUDIO_ES },
+ { VLC_CODEC_COOK, AV_CODEC_ID_COOK },
+ { VLC_CODEC_TRUESPEECH, AV_CODEC_ID_TRUESPEECH },
+ { VLC_CODEC_TTA, AV_CODEC_ID_TTA },
+ { VLC_CODEC_SMACKAUDIO, AV_CODEC_ID_SMACKAUDIO },
+ { VLC_CODEC_QCELP, AV_CODEC_ID_QCELP },
+ { VLC_CODEC_WAVPACK, AV_CODEC_ID_WAVPACK },
+ { VLC_CODEC_DSICINAUDIO, AV_CODEC_ID_DSICINAUDIO },
+ { VLC_CODEC_IMC, AV_CODEC_ID_IMC },
+ { VLC_CODEC_MUSEPACK7, AV_CODEC_ID_MUSEPACK7 },
+ { VLC_CODEC_MLP, AV_CODEC_ID_MLP },
+ { VLC_CODEC_GSM_MS, AV_CODEC_ID_GSM_MS },
+ { VLC_CODEC_ATRAC3, AV_CODEC_ID_ATRAC3 },
+ { VLC_CODEC_APE, AV_CODEC_ID_APE },
+ { VLC_CODEC_NELLYMOSER, AV_CODEC_ID_NELLYMOSER },
+ { VLC_CODEC_MUSEPACK8, AV_CODEC_ID_MUSEPACK8 },
+ { VLC_CODEC_SPEEX, AV_CODEC_ID_SPEEX },
+ { VLC_CODEC_WMAS, AV_CODEC_ID_WMAVOICE },
+ { VLC_CODEC_WMAP, AV_CODEC_ID_WMAPRO },
+ { VLC_CODEC_WMAL, AV_CODEC_ID_WMALOSSLESS },
+ { VLC_CODEC_ATRAC3P, AV_CODEC_ID_ATRAC3P },
+ { VLC_CODEC_EAC3, AV_CODEC_ID_EAC3 },
+ { VLC_CODEC_SIPR, AV_CODEC_ID_SIPR },
/* AV_CODEC_ID_MP1 */
- { VLC_CODEC_TWINVQ, AV_CODEC_ID_TWINVQ, AUDIO_ES },
- { VLC_CODEC_TRUEHD, AV_CODEC_ID_TRUEHD, AUDIO_ES },
- { VLC_CODEC_ALS, AV_CODEC_ID_MP4ALS, AUDIO_ES },
- { VLC_CODEC_ATRAC1, AV_CODEC_ID_ATRAC1, AUDIO_ES },
- { VLC_CODEC_BINKAUDIO_DCT, AV_CODEC_ID_BINKAUDIO_DCT, AUDIO_ES },
- { VLC_CODEC_BINKAUDIO_RDFT, AV_CODEC_ID_BINKAUDIO_RDFT, AUDIO_ES },
- { VLC_CODEC_MP4A, AV_CODEC_ID_AAC_LATM, AUDIO_ES },
+ { VLC_CODEC_TWINVQ, AV_CODEC_ID_TWINVQ },
+ { VLC_CODEC_TRUEHD, AV_CODEC_ID_TRUEHD },
+ { VLC_CODEC_ALS, AV_CODEC_ID_MP4ALS },
+ { VLC_CODEC_ATRAC1, AV_CODEC_ID_ATRAC1 },
+ { VLC_CODEC_BINKAUDIO_DCT, AV_CODEC_ID_BINKAUDIO_DCT },
+ { VLC_CODEC_BINKAUDIO_RDFT, AV_CODEC_ID_BINKAUDIO_RDFT },
+ { VLC_CODEC_MP4A, AV_CODEC_ID_AAC_LATM },
/* AV_CODEC_ID_QDMC */
/* AV_CODEC_ID_CELT */
- { VLC_CODEC_G723_1, AV_CODEC_ID_G723_1, AUDIO_ES },
+ { VLC_CODEC_G723_1, AV_CODEC_ID_G723_1 },
/* AV_CODEC_ID_G729 */
/* AV_CODEC_ID_8SVX_EXP */
/* AV_CODEC_ID_8SVX_FIB */
- { VLC_CODEC_BMVAUDIO, AV_CODEC_ID_BMV_AUDIO, AUDIO_ES },
- { VLC_CODEC_RALF, AV_CODEC_ID_RALF, AUDIO_ES },
- { VLC_CODEC_INDEO_AUDIO, AV_CODEC_ID_IAC, AUDIO_ES },
+ { VLC_CODEC_BMVAUDIO, AV_CODEC_ID_BMV_AUDIO },
+ { VLC_CODEC_RALF, AV_CODEC_ID_RALF },
+ { VLC_CODEC_INDEO_AUDIO, AV_CODEC_ID_IAC },
/* AV_CODEC_ID_ILBC */
- { VLC_CODEC_OPUS, AV_CODEC_ID_OPUS, AUDIO_ES },
+ { VLC_CODEC_OPUS, AV_CODEC_ID_OPUS },
/* AV_CODEC_ID_COMFORT_NOISE */
- { VLC_CODEC_TAK, AV_CODEC_ID_TAK, AUDIO_ES },
- { VLC_CODEC_METASOUND, AV_CODEC_ID_METASOUND, AUDIO_ES },
+ { VLC_CODEC_TAK, AV_CODEC_ID_TAK },
+ { VLC_CODEC_METASOUND, AV_CODEC_ID_METASOUND },
/* AV_CODEC_ID_PAF_AUDIO */
- { VLC_CODEC_ON2AVC, AV_CODEC_ID_ON2AVC, AUDIO_ES },
+ { VLC_CODEC_ON2AVC, AV_CODEC_ID_ON2AVC },
/* ffmpeg only: AV_CODEC_ID_FFWAVESYNTH */
/* ffmpeg only: AV_CODEC_ID_SONIC */
@@ -464,17 +463,17 @@ static const struct vlc_avcodec_fourcc audio_codecs[] =
/* Subtitle streams */
static const struct vlc_avcodec_fourcc spu_codecs[] =
{
- { VLC_CODEC_SPU, AV_CODEC_ID_DVD_SUBTITLE, SPU_ES },
- { VLC_CODEC_DVBS, AV_CODEC_ID_DVB_SUBTITLE, SPU_ES },
- { VLC_CODEC_SUBT, AV_CODEC_ID_TEXT, SPU_ES },
- { VLC_CODEC_XSUB, AV_CODEC_ID_XSUB, SPU_ES },
- { VLC_CODEC_SSA, AV_CODEC_ID_SSA, SPU_ES },
+ { VLC_CODEC_SPU, AV_CODEC_ID_DVD_SUBTITLE },
+ { VLC_CODEC_DVBS, AV_CODEC_ID_DVB_SUBTITLE },
+ { VLC_CODEC_SUBT, AV_CODEC_ID_TEXT },
+ { VLC_CODEC_XSUB, AV_CODEC_ID_XSUB },
+ { VLC_CODEC_SSA, AV_CODEC_ID_SSA },
/* AV_CODEC_ID_MOV_TEXT */
- { VLC_CODEC_BD_PG, AV_CODEC_ID_HDMV_PGS_SUBTITLE, SPU_ES },
+ { VLC_CODEC_BD_PG, AV_CODEC_ID_HDMV_PGS_SUBTITLE },
#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 100 )
- { VLC_CODEC_BD_TEXT, AV_CODEC_ID_HDMV_TEXT_SUBTITLE, SPU_ES },
+ { VLC_CODEC_BD_TEXT, AV_CODEC_ID_HDMV_TEXT_SUBTITLE },
#endif
- { VLC_CODEC_TELETEXT, AV_CODEC_ID_DVB_TELETEXT, SPU_ES },
+ { VLC_CODEC_TELETEXT, AV_CODEC_ID_DVB_TELETEXT },
/* AV_CODEC_ID_SRT */
/* ffmpeg only: AV_CODEC_ID_MICRODVD */
/* ffmpeg only: AV_CODEC_ID_EIA_608 */
@@ -495,6 +494,7 @@ int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat,
unsigned *pi_ffmpeg_codec, const char **ppsz_name )
{
const struct vlc_avcodec_fourcc *mapping;
+ unsigned cat;
i_fourcc = vlc_fourcc_GetCodec( UNKNOWN_ES, i_fourcc );
@@ -502,29 +502,38 @@ int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat,
{
mapping = video_codecs + i;
if( mapping->i_fourcc == i_fourcc )
+ {
+ cat = VIDEO_ES;
goto found;
+ }
}
for( size_t i = 0; i < ARRAY_SIZE(audio_codecs); i++ )
{
mapping = audio_codecs + i;
if( mapping->i_fourcc == i_fourcc )
+ {
+ cat = AUDIO_ES;
goto found;
+ }
}
for( size_t i = 0; i < ARRAY_SIZE(spu_codecs); i++ )
{
mapping = spu_codecs + i;
if( mapping->i_fourcc == i_fourcc )
+ {
+ cat = SPU_ES;
goto found;
+ }
}
return false;
found:
if( pi_cat != NULL )
- *pi_cat = mapping->i_cat;
+ *pi_cat = cat;
if( pi_ffmpeg_codec != NULL )
*pi_ffmpeg_codec = mapping->i_codec;
if( ppsz_name )
- *ppsz_name = vlc_fourcc_GetDescription( mapping->i_cat, i_fourcc );
+ *ppsz_name = vlc_fourcc_GetDescription( cat, i_fourcc );
return true;
}
More information about the vlc-commits
mailing list