|
|
|
@ -277,12 +277,13 @@ static const muxer_properties_t p_muxers[] = { |
|
|
|
//M( "avformat{mux=flac}", "flac", 1, VLC_CODEC_FLAC ), BROKEN
|
|
|
|
|
|
|
|
M( "ogg", "ogg", INT_MAX, VLC_CODEC_VORBIS, VLC_CODEC_SPEEX, VLC_CODEC_FLAC, |
|
|
|
VLC_CODEC_SUBT, VLC_CODEC_THEORA, VLC_CODEC_DIRAC ), |
|
|
|
VLC_CODEC_SUBT, VLC_CODEC_THEORA, VLC_CODEC_DIRAC, |
|
|
|
VLC_CODEC_OPUS ), |
|
|
|
|
|
|
|
M( "asf", "asf", 127, VLC_CODEC_WMA1, VLC_CODEC_WMA2, VLC_CODEC_WMAP, VLC_CODEC_WMAL, VLC_CODEC_WMAS, |
|
|
|
VLC_CODEC_WMV1, VLC_CODEC_WMV2, VLC_CODEC_WMV3, VLC_CODEC_VC1 ), |
|
|
|
|
|
|
|
M( "mp4", "mp4", INT_MAX, VLC_CODEC_MP4A, VLC_CODEC_H264, VLC_CODEC_MP4V, |
|
|
|
M( "mp4", "mp4", INT_MAX, VLC_CODEC_MP4A, VLC_CODEC_H264, VLC_CODEC_MP4V, VLC_CODEC_HEVC, |
|
|
|
VLC_CODEC_SUBT ), |
|
|
|
|
|
|
|
M( "ps", "mpg", 16/* FIXME*/,VLC_CODEC_MPGV, |
|
|
|
@ -296,12 +297,12 @@ static const muxer_properties_t p_muxers[] = { |
|
|
|
VLC_CODEC_MP4V ), |
|
|
|
|
|
|
|
M( "ts", "ts", 8000, VLC_CODEC_MPGV, |
|
|
|
VLC_CODEC_H264, |
|
|
|
VLC_CODEC_H264, VLC_CODEC_HEVC, |
|
|
|
VLC_CODEC_MPGA, VLC_CODEC_DVD_LPCM, VLC_CODEC_A52, |
|
|
|
VLC_CODEC_DTS, VLC_CODEC_MP4A, |
|
|
|
VLC_CODEC_DVBS, VLC_CODEC_TELETEXT ), |
|
|
|
|
|
|
|
M( "mkv", "mkv", 32, VLC_CODEC_H264, VLC_CODEC_VP8, VLC_CODEC_MP4V, |
|
|
|
M( "mkv", "mkv", 32, VLC_CODEC_H264, VLC_CODEC_HEVC, VLC_CODEC_VP8, VLC_CODEC_MP4V, |
|
|
|
VLC_CODEC_A52, VLC_CODEC_MP4A, VLC_CODEC_VORBIS, VLC_CODEC_FLAC ), |
|
|
|
}; |
|
|
|
#undef M |
|
|
|
|