FFmpeg: Rename all CODEC_ID_* to AV_CODEC_ID_*.
This commit is contained in:
benjamin.drung@gmail.com
parent
33b9e9336f
commit
feae3ffa98
|
|
@ -445,7 +445,7 @@ bool ExportFFmpeg::InitCodecs(AudacityProject *project)
|
|||
mEncAudioCodecCtx->sample_fmt = AV_SAMPLE_FMT_S16;
|
||||
mEncAudioCodecCtx->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
|
||||
|
||||
if (mEncAudioCodecCtx->codec_id == CODEC_ID_AC3)
|
||||
if (mEncAudioCodecCtx->codec_id == AV_CODEC_ID_AC3)
|
||||
{
|
||||
// As of Jan 4, 2011, the default AC3 encoder only accept SAMPLE_FMT_FLT samples.
|
||||
// But, currently, Audacity only supports SAMPLE_FMT_S16. So, for now, look for the
|
||||
|
|
|
|||
|
|
@ -795,310 +795,310 @@ END_EVENT_TABLE()
|
|||
/// Must end with NULL entry
|
||||
CompatibilityEntry ExportFFmpegOptions::CompatibilityList[] =
|
||||
{
|
||||
{ wxT("adts"), CODEC_ID_AAC },
|
||||
{ wxT("adts"), AV_CODEC_ID_AAC },
|
||||
|
||||
{ wxT("aiff"), CODEC_ID_PCM_S16BE },
|
||||
{ wxT("aiff"), CODEC_ID_PCM_S8 },
|
||||
{ wxT("aiff"), CODEC_ID_PCM_S24BE },
|
||||
{ wxT("aiff"), CODEC_ID_PCM_S32BE },
|
||||
{ wxT("aiff"), CODEC_ID_PCM_ALAW },
|
||||
{ wxT("aiff"), CODEC_ID_PCM_MULAW },
|
||||
{ wxT("aiff"), CODEC_ID_MACE3 },
|
||||
{ wxT("aiff"), CODEC_ID_MACE6 },
|
||||
{ wxT("aiff"), CODEC_ID_GSM },
|
||||
{ wxT("aiff"), CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("aiff"), CODEC_ID_PCM_S16LE },
|
||||
{ wxT("aiff"), CODEC_ID_ADPCM_IMA_QT },
|
||||
{ wxT("aiff"), CODEC_ID_QDM2 },
|
||||
{ wxT("aiff"), AV_CODEC_ID_PCM_S16BE },
|
||||
{ wxT("aiff"), AV_CODEC_ID_PCM_S8 },
|
||||
{ wxT("aiff"), AV_CODEC_ID_PCM_S24BE },
|
||||
{ wxT("aiff"), AV_CODEC_ID_PCM_S32BE },
|
||||
{ wxT("aiff"), AV_CODEC_ID_PCM_ALAW },
|
||||
{ wxT("aiff"), AV_CODEC_ID_PCM_MULAW },
|
||||
{ wxT("aiff"), AV_CODEC_ID_MACE3 },
|
||||
{ wxT("aiff"), AV_CODEC_ID_MACE6 },
|
||||
{ wxT("aiff"), AV_CODEC_ID_GSM },
|
||||
{ wxT("aiff"), AV_CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("aiff"), AV_CODEC_ID_PCM_S16LE },
|
||||
{ wxT("aiff"), AV_CODEC_ID_ADPCM_IMA_QT },
|
||||
{ wxT("aiff"), AV_CODEC_ID_QDM2 },
|
||||
|
||||
{ wxT("amr"), CODEC_ID_AMR_NB },
|
||||
{ wxT("amr"), CODEC_ID_AMR_WB },
|
||||
{ wxT("amr"), AV_CODEC_ID_AMR_NB },
|
||||
{ wxT("amr"), AV_CODEC_ID_AMR_WB },
|
||||
|
||||
{ wxT("asf"), CODEC_ID_PCM_S16LE },
|
||||
{ wxT("asf"), CODEC_ID_PCM_U8 },
|
||||
{ wxT("asf"), CODEC_ID_PCM_S24LE },
|
||||
{ wxT("asf"), CODEC_ID_PCM_S32LE },
|
||||
{ wxT("asf"), CODEC_ID_ADPCM_MS },
|
||||
{ wxT("asf"), CODEC_ID_PCM_ALAW },
|
||||
{ wxT("asf"), CODEC_ID_PCM_MULAW },
|
||||
{ wxT("asf"), CODEC_ID_WMAVOICE },
|
||||
{ wxT("asf"), CODEC_ID_ADPCM_IMA_WAV },
|
||||
{ wxT("asf"), CODEC_ID_ADPCM_YAMAHA },
|
||||
{ wxT("asf"), CODEC_ID_TRUESPEECH },
|
||||
{ wxT("asf"), CODEC_ID_GSM_MS },
|
||||
{ wxT("asf"), CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("asf"), CODEC_ID_MP2 },
|
||||
{ wxT("asf"), CODEC_ID_MP3 },
|
||||
{ wxT("asf"), CODEC_ID_VOXWARE },
|
||||
{ wxT("asf"), CODEC_ID_AAC },
|
||||
{ wxT("asf"), CODEC_ID_WMAV1 },
|
||||
{ wxT("asf"), CODEC_ID_WMAV2 },
|
||||
{ wxT("asf"), CODEC_ID_WMAPRO },
|
||||
{ wxT("asf"), CODEC_ID_ADPCM_CT },
|
||||
{ wxT("asf"), CODEC_ID_ATRAC3 },
|
||||
{ wxT("asf"), CODEC_ID_IMC },
|
||||
{ wxT("asf"), CODEC_ID_AC3 },
|
||||
{ wxT("asf"), CODEC_ID_DTS },
|
||||
{ wxT("asf"), AV_CODEC_ID_PCM_S16LE },
|
||||
{ wxT("asf"), AV_CODEC_ID_PCM_U8 },
|
||||
{ wxT("asf"), AV_CODEC_ID_PCM_S24LE },
|
||||
{ wxT("asf"), AV_CODEC_ID_PCM_S32LE },
|
||||
{ wxT("asf"), AV_CODEC_ID_ADPCM_MS },
|
||||
{ wxT("asf"), AV_CODEC_ID_PCM_ALAW },
|
||||
{ wxT("asf"), AV_CODEC_ID_PCM_MULAW },
|
||||
{ wxT("asf"), AV_CODEC_ID_WMAVOICE },
|
||||
{ wxT("asf"), AV_CODEC_ID_ADPCM_IMA_WAV },
|
||||
{ wxT("asf"), AV_CODEC_ID_ADPCM_YAMAHA },
|
||||
{ wxT("asf"), AV_CODEC_ID_TRUESPEECH },
|
||||
{ wxT("asf"), AV_CODEC_ID_GSM_MS },
|
||||
{ wxT("asf"), AV_CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("asf"), AV_CODEC_ID_MP2 },
|
||||
{ wxT("asf"), AV_CODEC_ID_MP3 },
|
||||
{ wxT("asf"), AV_CODEC_ID_VOXWARE },
|
||||
{ wxT("asf"), AV_CODEC_ID_AAC },
|
||||
{ wxT("asf"), AV_CODEC_ID_WMAV1 },
|
||||
{ wxT("asf"), AV_CODEC_ID_WMAV2 },
|
||||
{ wxT("asf"), AV_CODEC_ID_WMAPRO },
|
||||
{ wxT("asf"), AV_CODEC_ID_ADPCM_CT },
|
||||
{ wxT("asf"), AV_CODEC_ID_ATRAC3 },
|
||||
{ wxT("asf"), AV_CODEC_ID_IMC },
|
||||
{ wxT("asf"), AV_CODEC_ID_AC3 },
|
||||
{ wxT("asf"), AV_CODEC_ID_DTS },
|
||||
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || (LIBAVCODEC_VERSION_MAJOR == 53)
|
||||
{ wxT("asf"), CODEC_ID_SONIC },
|
||||
{ wxT("asf"), CODEC_ID_SONIC_LS },
|
||||
{ wxT("asf"), AV_CODEC_ID_SONIC },
|
||||
{ wxT("asf"), AV_CODEC_ID_SONIC_LS },
|
||||
#endif
|
||||
{ wxT("asf"), CODEC_ID_FLAC },
|
||||
{ wxT("asf"), CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("asf"), CODEC_ID_VORBIS },
|
||||
{ wxT("asf"), AV_CODEC_ID_FLAC },
|
||||
{ wxT("asf"), AV_CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("asf"), AV_CODEC_ID_VORBIS },
|
||||
|
||||
{ wxT("au"), CODEC_ID_PCM_MULAW },
|
||||
{ wxT("au"), CODEC_ID_PCM_S8 },
|
||||
{ wxT("au"), CODEC_ID_PCM_S16BE },
|
||||
{ wxT("au"), CODEC_ID_PCM_ALAW },
|
||||
{ wxT("au"), AV_CODEC_ID_PCM_MULAW },
|
||||
{ wxT("au"), AV_CODEC_ID_PCM_S8 },
|
||||
{ wxT("au"), AV_CODEC_ID_PCM_S16BE },
|
||||
{ wxT("au"), AV_CODEC_ID_PCM_ALAW },
|
||||
|
||||
{ wxT("avi"), CODEC_ID_PCM_S16LE },
|
||||
{ wxT("avi"), CODEC_ID_PCM_U8 },
|
||||
{ wxT("avi"), CODEC_ID_PCM_S24LE },
|
||||
{ wxT("avi"), CODEC_ID_PCM_S32LE },
|
||||
{ wxT("avi"), CODEC_ID_ADPCM_MS },
|
||||
{ wxT("avi"), CODEC_ID_PCM_ALAW },
|
||||
{ wxT("avi"), CODEC_ID_PCM_MULAW },
|
||||
{ wxT("avi"), CODEC_ID_WMAVOICE },
|
||||
{ wxT("avi"), CODEC_ID_ADPCM_IMA_WAV },
|
||||
{ wxT("avi"), CODEC_ID_ADPCM_YAMAHA },
|
||||
{ wxT("avi"), CODEC_ID_TRUESPEECH },
|
||||
{ wxT("avi"), CODEC_ID_GSM_MS },
|
||||
{ wxT("avi"), CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("avi"), CODEC_ID_MP2 },
|
||||
{ wxT("avi"), CODEC_ID_MP3 },
|
||||
{ wxT("avi"), CODEC_ID_VOXWARE },
|
||||
{ wxT("avi"), CODEC_ID_AAC },
|
||||
{ wxT("avi"), CODEC_ID_WMAV1 },
|
||||
{ wxT("avi"), CODEC_ID_WMAV2 },
|
||||
{ wxT("avi"), CODEC_ID_WMAPRO },
|
||||
{ wxT("avi"), CODEC_ID_ADPCM_CT },
|
||||
{ wxT("avi"), CODEC_ID_ATRAC3 },
|
||||
{ wxT("avi"), CODEC_ID_IMC },
|
||||
{ wxT("avi"), CODEC_ID_AC3 },
|
||||
{ wxT("avi"), CODEC_ID_DTS },
|
||||
{ wxT("avi"), AV_CODEC_ID_PCM_S16LE },
|
||||
{ wxT("avi"), AV_CODEC_ID_PCM_U8 },
|
||||
{ wxT("avi"), AV_CODEC_ID_PCM_S24LE },
|
||||
{ wxT("avi"), AV_CODEC_ID_PCM_S32LE },
|
||||
{ wxT("avi"), AV_CODEC_ID_ADPCM_MS },
|
||||
{ wxT("avi"), AV_CODEC_ID_PCM_ALAW },
|
||||
{ wxT("avi"), AV_CODEC_ID_PCM_MULAW },
|
||||
{ wxT("avi"), AV_CODEC_ID_WMAVOICE },
|
||||
{ wxT("avi"), AV_CODEC_ID_ADPCM_IMA_WAV },
|
||||
{ wxT("avi"), AV_CODEC_ID_ADPCM_YAMAHA },
|
||||
{ wxT("avi"), AV_CODEC_ID_TRUESPEECH },
|
||||
{ wxT("avi"), AV_CODEC_ID_GSM_MS },
|
||||
{ wxT("avi"), AV_CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("avi"), AV_CODEC_ID_MP2 },
|
||||
{ wxT("avi"), AV_CODEC_ID_MP3 },
|
||||
{ wxT("avi"), AV_CODEC_ID_VOXWARE },
|
||||
{ wxT("avi"), AV_CODEC_ID_AAC },
|
||||
{ wxT("avi"), AV_CODEC_ID_WMAV1 },
|
||||
{ wxT("avi"), AV_CODEC_ID_WMAV2 },
|
||||
{ wxT("avi"), AV_CODEC_ID_WMAPRO },
|
||||
{ wxT("avi"), AV_CODEC_ID_ADPCM_CT },
|
||||
{ wxT("avi"), AV_CODEC_ID_ATRAC3 },
|
||||
{ wxT("avi"), AV_CODEC_ID_IMC },
|
||||
{ wxT("avi"), AV_CODEC_ID_AC3 },
|
||||
{ wxT("avi"), AV_CODEC_ID_DTS },
|
||||
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || (LIBAVCODEC_VERSION_MAJOR == 53)
|
||||
{ wxT("avi"), CODEC_ID_SONIC },
|
||||
{ wxT("avi"), CODEC_ID_SONIC_LS },
|
||||
{ wxT("avi"), AV_CODEC_ID_SONIC },
|
||||
{ wxT("avi"), AV_CODEC_ID_SONIC_LS },
|
||||
#endif
|
||||
{ wxT("avi"), CODEC_ID_FLAC },
|
||||
{ wxT("avi"), CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("avi"), CODEC_ID_VORBIS },
|
||||
{ wxT("avi"), AV_CODEC_ID_FLAC },
|
||||
{ wxT("avi"), AV_CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("avi"), AV_CODEC_ID_VORBIS },
|
||||
|
||||
{ wxT("crc"), CODEC_ID_NONE },
|
||||
{ wxT("crc"), AV_CODEC_ID_NONE },
|
||||
|
||||
{ wxT("dv"), CODEC_ID_PCM_S16LE },
|
||||
{ wxT("dv"), AV_CODEC_ID_PCM_S16LE },
|
||||
|
||||
{ wxT("ffm"), CODEC_ID_NONE },
|
||||
{ wxT("ffm"), AV_CODEC_ID_NONE },
|
||||
|
||||
{ wxT("flv"), CODEC_ID_MP3 },
|
||||
{ wxT("flv"), CODEC_ID_PCM_S8 },
|
||||
{ wxT("flv"), CODEC_ID_PCM_S16BE },
|
||||
{ wxT("flv"), CODEC_ID_PCM_S16LE },
|
||||
{ wxT("flv"), CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("flv"), CODEC_ID_AAC },
|
||||
{ wxT("flv"), CODEC_ID_NELLYMOSER },
|
||||
{ wxT("flv"), AV_CODEC_ID_MP3 },
|
||||
{ wxT("flv"), AV_CODEC_ID_PCM_S8 },
|
||||
{ wxT("flv"), AV_CODEC_ID_PCM_S16BE },
|
||||
{ wxT("flv"), AV_CODEC_ID_PCM_S16LE },
|
||||
{ wxT("flv"), AV_CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("flv"), AV_CODEC_ID_AAC },
|
||||
{ wxT("flv"), AV_CODEC_ID_NELLYMOSER },
|
||||
|
||||
{ wxT("framecrc"), CODEC_ID_NONE },
|
||||
{ wxT("framecrc"), AV_CODEC_ID_NONE },
|
||||
|
||||
{ wxT("gxf"), CODEC_ID_PCM_S16LE },
|
||||
{ wxT("gxf"), AV_CODEC_ID_PCM_S16LE },
|
||||
|
||||
{ wxT("matroska"), CODEC_ID_PCM_S16LE },
|
||||
{ wxT("matroska"), CODEC_ID_PCM_U8 },
|
||||
{ wxT("matroska"), CODEC_ID_PCM_S24LE },
|
||||
{ wxT("matroska"), CODEC_ID_PCM_S32LE },
|
||||
{ wxT("matroska"), CODEC_ID_ADPCM_MS },
|
||||
{ wxT("matroska"), CODEC_ID_PCM_ALAW },
|
||||
{ wxT("matroska"), CODEC_ID_PCM_MULAW },
|
||||
{ wxT("matroska"), CODEC_ID_WMAVOICE },
|
||||
{ wxT("matroska"), CODEC_ID_ADPCM_IMA_WAV },
|
||||
{ wxT("matroska"), CODEC_ID_ADPCM_YAMAHA },
|
||||
{ wxT("matroska"), CODEC_ID_TRUESPEECH },
|
||||
{ wxT("matroska"), CODEC_ID_GSM_MS },
|
||||
{ wxT("matroska"), CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("matroska"), CODEC_ID_MP2 },
|
||||
{ wxT("matroska"), CODEC_ID_MP3 },
|
||||
{ wxT("matroska"), CODEC_ID_VOXWARE },
|
||||
{ wxT("matroska"), CODEC_ID_AAC },
|
||||
{ wxT("matroska"), CODEC_ID_WMAV1 },
|
||||
{ wxT("matroska"), CODEC_ID_WMAV2 },
|
||||
{ wxT("matroska"), CODEC_ID_WMAPRO },
|
||||
{ wxT("matroska"), CODEC_ID_ADPCM_CT },
|
||||
{ wxT("matroska"), CODEC_ID_ATRAC3 },
|
||||
{ wxT("matroska"), CODEC_ID_IMC },
|
||||
{ wxT("matroska"), CODEC_ID_AC3 },
|
||||
{ wxT("matroska"), CODEC_ID_DTS },
|
||||
{ wxT("matroska"), AV_CODEC_ID_PCM_S16LE },
|
||||
{ wxT("matroska"), AV_CODEC_ID_PCM_U8 },
|
||||
{ wxT("matroska"), AV_CODEC_ID_PCM_S24LE },
|
||||
{ wxT("matroska"), AV_CODEC_ID_PCM_S32LE },
|
||||
{ wxT("matroska"), AV_CODEC_ID_ADPCM_MS },
|
||||
{ wxT("matroska"), AV_CODEC_ID_PCM_ALAW },
|
||||
{ wxT("matroska"), AV_CODEC_ID_PCM_MULAW },
|
||||
{ wxT("matroska"), AV_CODEC_ID_WMAVOICE },
|
||||
{ wxT("matroska"), AV_CODEC_ID_ADPCM_IMA_WAV },
|
||||
{ wxT("matroska"), AV_CODEC_ID_ADPCM_YAMAHA },
|
||||
{ wxT("matroska"), AV_CODEC_ID_TRUESPEECH },
|
||||
{ wxT("matroska"), AV_CODEC_ID_GSM_MS },
|
||||
{ wxT("matroska"), AV_CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("matroska"), AV_CODEC_ID_MP2 },
|
||||
{ wxT("matroska"), AV_CODEC_ID_MP3 },
|
||||
{ wxT("matroska"), AV_CODEC_ID_VOXWARE },
|
||||
{ wxT("matroska"), AV_CODEC_ID_AAC },
|
||||
{ wxT("matroska"), AV_CODEC_ID_WMAV1 },
|
||||
{ wxT("matroska"), AV_CODEC_ID_WMAV2 },
|
||||
{ wxT("matroska"), AV_CODEC_ID_WMAPRO },
|
||||
{ wxT("matroska"), AV_CODEC_ID_ADPCM_CT },
|
||||
{ wxT("matroska"), AV_CODEC_ID_ATRAC3 },
|
||||
{ wxT("matroska"), AV_CODEC_ID_IMC },
|
||||
{ wxT("matroska"), AV_CODEC_ID_AC3 },
|
||||
{ wxT("matroska"), AV_CODEC_ID_DTS },
|
||||
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || (LIBAVCODEC_VERSION_MAJOR == 53)
|
||||
{ wxT("matroska"), CODEC_ID_SONIC },
|
||||
{ wxT("matroska"), CODEC_ID_SONIC_LS },
|
||||
{ wxT("matroska"), AV_CODEC_ID_SONIC },
|
||||
{ wxT("matroska"), AV_CODEC_ID_SONIC_LS },
|
||||
#endif
|
||||
{ wxT("matroska"), CODEC_ID_FLAC },
|
||||
{ wxT("matroska"), CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("matroska"), CODEC_ID_VORBIS },
|
||||
{ wxT("matroska"), AV_CODEC_ID_FLAC },
|
||||
{ wxT("matroska"), AV_CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("matroska"), AV_CODEC_ID_VORBIS },
|
||||
|
||||
{ wxT("mmf"), CODEC_ID_ADPCM_YAMAHA },
|
||||
{ wxT("mmf"), AV_CODEC_ID_ADPCM_YAMAHA },
|
||||
|
||||
{ wxT("mov"), CODEC_ID_PCM_S32BE }, //mov
|
||||
{ wxT("mov"), CODEC_ID_PCM_S32LE },
|
||||
{ wxT("mov"), CODEC_ID_PCM_S24BE },
|
||||
{ wxT("mov"), CODEC_ID_PCM_S24LE },
|
||||
{ wxT("mov"), CODEC_ID_PCM_S16BE },
|
||||
{ wxT("mov"), CODEC_ID_PCM_S16LE },
|
||||
{ wxT("mov"), CODEC_ID_PCM_S8 },
|
||||
{ wxT("mov"), CODEC_ID_PCM_U8 },
|
||||
{ wxT("mov"), CODEC_ID_PCM_MULAW },
|
||||
{ wxT("mov"), CODEC_ID_PCM_ALAW },
|
||||
{ wxT("mov"), CODEC_ID_ADPCM_IMA_QT },
|
||||
{ wxT("mov"), CODEC_ID_MACE3 },
|
||||
{ wxT("mov"), CODEC_ID_MACE6 },
|
||||
{ wxT("mov"), CODEC_ID_MP3 },
|
||||
{ wxT("mov"), CODEC_ID_AAC },
|
||||
{ wxT("mov"), CODEC_ID_AMR_NB },
|
||||
{ wxT("mov"), CODEC_ID_AMR_WB },
|
||||
{ wxT("mov"), CODEC_ID_GSM },
|
||||
{ wxT("mov"), CODEC_ID_ALAC },
|
||||
{ wxT("mov"), CODEC_ID_QCELP },
|
||||
{ wxT("mov"), CODEC_ID_QDM2 },
|
||||
{ wxT("mov"), CODEC_ID_DVAUDIO },
|
||||
{ wxT("mov"), CODEC_ID_WMAV2 },
|
||||
{ wxT("mov"), CODEC_ID_ALAC },
|
||||
{ wxT("mov"), AV_CODEC_ID_PCM_S32BE }, //mov
|
||||
{ wxT("mov"), AV_CODEC_ID_PCM_S32LE },
|
||||
{ wxT("mov"), AV_CODEC_ID_PCM_S24BE },
|
||||
{ wxT("mov"), AV_CODEC_ID_PCM_S24LE },
|
||||
{ wxT("mov"), AV_CODEC_ID_PCM_S16BE },
|
||||
{ wxT("mov"), AV_CODEC_ID_PCM_S16LE },
|
||||
{ wxT("mov"), AV_CODEC_ID_PCM_S8 },
|
||||
{ wxT("mov"), AV_CODEC_ID_PCM_U8 },
|
||||
{ wxT("mov"), AV_CODEC_ID_PCM_MULAW },
|
||||
{ wxT("mov"), AV_CODEC_ID_PCM_ALAW },
|
||||
{ wxT("mov"), AV_CODEC_ID_ADPCM_IMA_QT },
|
||||
{ wxT("mov"), AV_CODEC_ID_MACE3 },
|
||||
{ wxT("mov"), AV_CODEC_ID_MACE6 },
|
||||
{ wxT("mov"), AV_CODEC_ID_MP3 },
|
||||
{ wxT("mov"), AV_CODEC_ID_AAC },
|
||||
{ wxT("mov"), AV_CODEC_ID_AMR_NB },
|
||||
{ wxT("mov"), AV_CODEC_ID_AMR_WB },
|
||||
{ wxT("mov"), AV_CODEC_ID_GSM },
|
||||
{ wxT("mov"), AV_CODEC_ID_ALAC },
|
||||
{ wxT("mov"), AV_CODEC_ID_QCELP },
|
||||
{ wxT("mov"), AV_CODEC_ID_QDM2 },
|
||||
{ wxT("mov"), AV_CODEC_ID_DVAUDIO },
|
||||
{ wxT("mov"), AV_CODEC_ID_WMAV2 },
|
||||
{ wxT("mov"), AV_CODEC_ID_ALAC },
|
||||
|
||||
{ wxT("mp4"), CODEC_ID_AAC },
|
||||
{ wxT("mp4"), CODEC_ID_QCELP },
|
||||
{ wxT("mp4"), CODEC_ID_MP3 },
|
||||
{ wxT("mp4"), CODEC_ID_VORBIS },
|
||||
{ wxT("mp4"), AV_CODEC_ID_AAC },
|
||||
{ wxT("mp4"), AV_CODEC_ID_QCELP },
|
||||
{ wxT("mp4"), AV_CODEC_ID_MP3 },
|
||||
{ wxT("mp4"), AV_CODEC_ID_VORBIS },
|
||||
|
||||
{ wxT("psp"), CODEC_ID_AAC },
|
||||
{ wxT("psp"), CODEC_ID_QCELP },
|
||||
{ wxT("psp"), CODEC_ID_MP3 },
|
||||
{ wxT("psp"), CODEC_ID_VORBIS },
|
||||
{ wxT("psp"), AV_CODEC_ID_AAC },
|
||||
{ wxT("psp"), AV_CODEC_ID_QCELP },
|
||||
{ wxT("psp"), AV_CODEC_ID_MP3 },
|
||||
{ wxT("psp"), AV_CODEC_ID_VORBIS },
|
||||
|
||||
{ wxT("ipod"), CODEC_ID_AAC },
|
||||
{ wxT("ipod"), CODEC_ID_QCELP },
|
||||
{ wxT("ipod"), CODEC_ID_MP3 },
|
||||
{ wxT("ipod"), CODEC_ID_VORBIS },
|
||||
{ wxT("ipod"), AV_CODEC_ID_AAC },
|
||||
{ wxT("ipod"), AV_CODEC_ID_QCELP },
|
||||
{ wxT("ipod"), AV_CODEC_ID_MP3 },
|
||||
{ wxT("ipod"), AV_CODEC_ID_VORBIS },
|
||||
|
||||
{ wxT("3gp"), CODEC_ID_AAC },
|
||||
{ wxT("3gp"), CODEC_ID_AMR_NB },
|
||||
{ wxT("3gp"), CODEC_ID_AMR_WB },
|
||||
{ wxT("3gp"), AV_CODEC_ID_AAC },
|
||||
{ wxT("3gp"), AV_CODEC_ID_AMR_NB },
|
||||
{ wxT("3gp"), AV_CODEC_ID_AMR_WB },
|
||||
|
||||
{ wxT("3g2"), CODEC_ID_AAC },
|
||||
{ wxT("3g2"), CODEC_ID_AMR_NB },
|
||||
{ wxT("3g2"), CODEC_ID_AMR_WB },
|
||||
{ wxT("3g2"), AV_CODEC_ID_AAC },
|
||||
{ wxT("3g2"), AV_CODEC_ID_AMR_NB },
|
||||
{ wxT("3g2"), AV_CODEC_ID_AMR_WB },
|
||||
|
||||
{ wxT("mp3"), CODEC_ID_MP3 },
|
||||
{ wxT("mp3"), AV_CODEC_ID_MP3 },
|
||||
|
||||
{ wxT("mpeg"), CODEC_ID_AC3 },
|
||||
{ wxT("mpeg"), CODEC_ID_DTS },
|
||||
{ wxT("mpeg"), CODEC_ID_PCM_S16BE },
|
||||
{ wxT("mpeg"), CODEC_ID_MP2 },
|
||||
{ wxT("mpeg"), AV_CODEC_ID_AC3 },
|
||||
{ wxT("mpeg"), AV_CODEC_ID_DTS },
|
||||
{ wxT("mpeg"), AV_CODEC_ID_PCM_S16BE },
|
||||
{ wxT("mpeg"), AV_CODEC_ID_MP2 },
|
||||
|
||||
{ wxT("vcd"), CODEC_ID_AC3 },
|
||||
{ wxT("vcd"), CODEC_ID_DTS },
|
||||
{ wxT("vcd"), CODEC_ID_PCM_S16BE },
|
||||
{ wxT("vcd"), CODEC_ID_MP2 },
|
||||
{ wxT("vcd"), AV_CODEC_ID_AC3 },
|
||||
{ wxT("vcd"), AV_CODEC_ID_DTS },
|
||||
{ wxT("vcd"), AV_CODEC_ID_PCM_S16BE },
|
||||
{ wxT("vcd"), AV_CODEC_ID_MP2 },
|
||||
|
||||
{ wxT("vob"), CODEC_ID_AC3 },
|
||||
{ wxT("vob"), CODEC_ID_DTS },
|
||||
{ wxT("vob"), CODEC_ID_PCM_S16BE },
|
||||
{ wxT("vob"), CODEC_ID_MP2 },
|
||||
{ wxT("vob"), AV_CODEC_ID_AC3 },
|
||||
{ wxT("vob"), AV_CODEC_ID_DTS },
|
||||
{ wxT("vob"), AV_CODEC_ID_PCM_S16BE },
|
||||
{ wxT("vob"), AV_CODEC_ID_MP2 },
|
||||
|
||||
{ wxT("svcd"), CODEC_ID_AC3 },
|
||||
{ wxT("svcd"), CODEC_ID_DTS },
|
||||
{ wxT("svcd"), CODEC_ID_PCM_S16BE },
|
||||
{ wxT("svcd"), CODEC_ID_MP2 },
|
||||
{ wxT("svcd"), AV_CODEC_ID_AC3 },
|
||||
{ wxT("svcd"), AV_CODEC_ID_DTS },
|
||||
{ wxT("svcd"), AV_CODEC_ID_PCM_S16BE },
|
||||
{ wxT("svcd"), AV_CODEC_ID_MP2 },
|
||||
|
||||
{ wxT("dvd"), CODEC_ID_AC3 },
|
||||
{ wxT("dvd"), CODEC_ID_DTS },
|
||||
{ wxT("dvd"), CODEC_ID_PCM_S16BE },
|
||||
{ wxT("dvd"), CODEC_ID_MP2 },
|
||||
{ wxT("dvd"), AV_CODEC_ID_AC3 },
|
||||
{ wxT("dvd"), AV_CODEC_ID_DTS },
|
||||
{ wxT("dvd"), AV_CODEC_ID_PCM_S16BE },
|
||||
{ wxT("dvd"), AV_CODEC_ID_MP2 },
|
||||
|
||||
{ wxT("nut"), CODEC_ID_PCM_S16LE },
|
||||
{ wxT("nut"), CODEC_ID_PCM_U8 },
|
||||
{ wxT("nut"), CODEC_ID_PCM_S24LE },
|
||||
{ wxT("nut"), CODEC_ID_PCM_S32LE },
|
||||
{ wxT("nut"), CODEC_ID_ADPCM_MS },
|
||||
{ wxT("nut"), CODEC_ID_PCM_ALAW },
|
||||
{ wxT("nut"), CODEC_ID_PCM_MULAW },
|
||||
{ wxT("nut"), CODEC_ID_WMAVOICE },
|
||||
{ wxT("nut"), CODEC_ID_ADPCM_IMA_WAV },
|
||||
{ wxT("nut"), CODEC_ID_ADPCM_YAMAHA },
|
||||
{ wxT("nut"), CODEC_ID_TRUESPEECH },
|
||||
{ wxT("nut"), CODEC_ID_GSM_MS },
|
||||
{ wxT("nut"), CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("nut"), CODEC_ID_MP2 },
|
||||
{ wxT("nut"), CODEC_ID_MP3 },
|
||||
{ wxT("nut"), CODEC_ID_VOXWARE },
|
||||
{ wxT("nut"), CODEC_ID_AAC },
|
||||
{ wxT("nut"), CODEC_ID_WMAV1 },
|
||||
{ wxT("nut"), CODEC_ID_WMAV2 },
|
||||
{ wxT("nut"), CODEC_ID_WMAPRO },
|
||||
{ wxT("nut"), CODEC_ID_ADPCM_CT },
|
||||
{ wxT("nut"), CODEC_ID_ATRAC3 },
|
||||
{ wxT("nut"), CODEC_ID_IMC },
|
||||
{ wxT("nut"), CODEC_ID_AC3 },
|
||||
{ wxT("nut"), CODEC_ID_DTS },
|
||||
{ wxT("nut"), AV_CODEC_ID_PCM_S16LE },
|
||||
{ wxT("nut"), AV_CODEC_ID_PCM_U8 },
|
||||
{ wxT("nut"), AV_CODEC_ID_PCM_S24LE },
|
||||
{ wxT("nut"), AV_CODEC_ID_PCM_S32LE },
|
||||
{ wxT("nut"), AV_CODEC_ID_ADPCM_MS },
|
||||
{ wxT("nut"), AV_CODEC_ID_PCM_ALAW },
|
||||
{ wxT("nut"), AV_CODEC_ID_PCM_MULAW },
|
||||
{ wxT("nut"), AV_CODEC_ID_WMAVOICE },
|
||||
{ wxT("nut"), AV_CODEC_ID_ADPCM_IMA_WAV },
|
||||
{ wxT("nut"), AV_CODEC_ID_ADPCM_YAMAHA },
|
||||
{ wxT("nut"), AV_CODEC_ID_TRUESPEECH },
|
||||
{ wxT("nut"), AV_CODEC_ID_GSM_MS },
|
||||
{ wxT("nut"), AV_CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("nut"), AV_CODEC_ID_MP2 },
|
||||
{ wxT("nut"), AV_CODEC_ID_MP3 },
|
||||
{ wxT("nut"), AV_CODEC_ID_VOXWARE },
|
||||
{ wxT("nut"), AV_CODEC_ID_AAC },
|
||||
{ wxT("nut"), AV_CODEC_ID_WMAV1 },
|
||||
{ wxT("nut"), AV_CODEC_ID_WMAV2 },
|
||||
{ wxT("nut"), AV_CODEC_ID_WMAPRO },
|
||||
{ wxT("nut"), AV_CODEC_ID_ADPCM_CT },
|
||||
{ wxT("nut"), AV_CODEC_ID_ATRAC3 },
|
||||
{ wxT("nut"), AV_CODEC_ID_IMC },
|
||||
{ wxT("nut"), AV_CODEC_ID_AC3 },
|
||||
{ wxT("nut"), AV_CODEC_ID_DTS },
|
||||
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || (LIBAVCODEC_VERSION_MAJOR == 53)
|
||||
{ wxT("nut"), CODEC_ID_SONIC },
|
||||
{ wxT("nut"), CODEC_ID_SONIC_LS },
|
||||
{ wxT("nut"), AV_CODEC_ID_SONIC },
|
||||
{ wxT("nut"), AV_CODEC_ID_SONIC_LS },
|
||||
#endif
|
||||
{ wxT("nut"), CODEC_ID_FLAC },
|
||||
{ wxT("nut"), CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("nut"), CODEC_ID_VORBIS },
|
||||
{ wxT("nut"), AV_CODEC_ID_FLAC },
|
||||
{ wxT("nut"), AV_CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("nut"), AV_CODEC_ID_VORBIS },
|
||||
|
||||
{ wxT("ogg"), CODEC_ID_VORBIS },
|
||||
{ wxT("ogg"), CODEC_ID_FLAC },
|
||||
{ wxT("ogg"), AV_CODEC_ID_VORBIS },
|
||||
{ wxT("ogg"), AV_CODEC_ID_FLAC },
|
||||
|
||||
{ wxT("ac3"), CODEC_ID_AC3 },
|
||||
{ wxT("ac3"), AV_CODEC_ID_AC3 },
|
||||
|
||||
{ wxT("dts"), CODEC_ID_DTS },
|
||||
{ wxT("dts"), AV_CODEC_ID_DTS },
|
||||
|
||||
{ wxT("flac"), CODEC_ID_FLAC },
|
||||
{ wxT("flac"), AV_CODEC_ID_FLAC },
|
||||
|
||||
{ wxT("RoQ"), CODEC_ID_ROQ_DPCM },
|
||||
{ wxT("RoQ"), AV_CODEC_ID_ROQ_DPCM },
|
||||
|
||||
{ wxT("rm"), CODEC_ID_AC3 },
|
||||
{ wxT("rm"), AV_CODEC_ID_AC3 },
|
||||
|
||||
{ wxT("swf"), CODEC_ID_MP3 },
|
||||
{ wxT("swf"), AV_CODEC_ID_MP3 },
|
||||
|
||||
{ wxT("avm2"), CODEC_ID_MP3 },
|
||||
{ wxT("avm2"), AV_CODEC_ID_MP3 },
|
||||
|
||||
{ wxT("voc"), CODEC_ID_PCM_U8 },
|
||||
{ wxT("voc"), AV_CODEC_ID_PCM_U8 },
|
||||
|
||||
{ wxT("wav"), CODEC_ID_PCM_S16LE },
|
||||
{ wxT("wav"), CODEC_ID_PCM_U8 },
|
||||
{ wxT("wav"), CODEC_ID_PCM_S24LE },
|
||||
{ wxT("wav"), CODEC_ID_PCM_S32LE },
|
||||
{ wxT("wav"), CODEC_ID_ADPCM_MS },
|
||||
{ wxT("wav"), CODEC_ID_PCM_ALAW },
|
||||
{ wxT("wav"), CODEC_ID_PCM_MULAW },
|
||||
{ wxT("wav"), CODEC_ID_WMAVOICE },
|
||||
{ wxT("wav"), CODEC_ID_ADPCM_IMA_WAV },
|
||||
{ wxT("wav"), CODEC_ID_ADPCM_YAMAHA },
|
||||
{ wxT("wav"), CODEC_ID_TRUESPEECH },
|
||||
{ wxT("wav"), CODEC_ID_GSM_MS },
|
||||
{ wxT("wav"), CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("wav"), CODEC_ID_MP2 },
|
||||
{ wxT("wav"), CODEC_ID_MP3 },
|
||||
{ wxT("wav"), CODEC_ID_VOXWARE },
|
||||
{ wxT("wav"), CODEC_ID_AAC },
|
||||
{ wxT("wav"), CODEC_ID_WMAV1 },
|
||||
{ wxT("wav"), CODEC_ID_WMAV2 },
|
||||
{ wxT("wav"), CODEC_ID_WMAPRO },
|
||||
{ wxT("wav"), CODEC_ID_ADPCM_CT },
|
||||
{ wxT("wav"), CODEC_ID_ATRAC3 },
|
||||
{ wxT("wav"), CODEC_ID_IMC },
|
||||
{ wxT("wav"), CODEC_ID_AC3 },
|
||||
{ wxT("wav"), CODEC_ID_DTS },
|
||||
{ wxT("wav"), AV_CODEC_ID_PCM_S16LE },
|
||||
{ wxT("wav"), AV_CODEC_ID_PCM_U8 },
|
||||
{ wxT("wav"), AV_CODEC_ID_PCM_S24LE },
|
||||
{ wxT("wav"), AV_CODEC_ID_PCM_S32LE },
|
||||
{ wxT("wav"), AV_CODEC_ID_ADPCM_MS },
|
||||
{ wxT("wav"), AV_CODEC_ID_PCM_ALAW },
|
||||
{ wxT("wav"), AV_CODEC_ID_PCM_MULAW },
|
||||
{ wxT("wav"), AV_CODEC_ID_WMAVOICE },
|
||||
{ wxT("wav"), AV_CODEC_ID_ADPCM_IMA_WAV },
|
||||
{ wxT("wav"), AV_CODEC_ID_ADPCM_YAMAHA },
|
||||
{ wxT("wav"), AV_CODEC_ID_TRUESPEECH },
|
||||
{ wxT("wav"), AV_CODEC_ID_GSM_MS },
|
||||
{ wxT("wav"), AV_CODEC_ID_ADPCM_G726 },
|
||||
{ wxT("wav"), AV_CODEC_ID_MP2 },
|
||||
{ wxT("wav"), AV_CODEC_ID_MP3 },
|
||||
{ wxT("wav"), AV_CODEC_ID_VOXWARE },
|
||||
{ wxT("wav"), AV_CODEC_ID_AAC },
|
||||
{ wxT("wav"), AV_CODEC_ID_WMAV1 },
|
||||
{ wxT("wav"), AV_CODEC_ID_WMAV2 },
|
||||
{ wxT("wav"), AV_CODEC_ID_WMAPRO },
|
||||
{ wxT("wav"), AV_CODEC_ID_ADPCM_CT },
|
||||
{ wxT("wav"), AV_CODEC_ID_ATRAC3 },
|
||||
{ wxT("wav"), AV_CODEC_ID_IMC },
|
||||
{ wxT("wav"), AV_CODEC_ID_AC3 },
|
||||
{ wxT("wav"), AV_CODEC_ID_DTS },
|
||||
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || (LIBAVCODEC_VERSION_MAJOR == 53)
|
||||
{ wxT("wav"), CODEC_ID_SONIC },
|
||||
{ wxT("wav"), CODEC_ID_SONIC_LS },
|
||||
{ wxT("wav"), AV_CODEC_ID_SONIC },
|
||||
{ wxT("wav"), AV_CODEC_ID_SONIC_LS },
|
||||
#endif
|
||||
{ wxT("wav"), CODEC_ID_FLAC },
|
||||
{ wxT("wav"), CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("wav"), CODEC_ID_VORBIS },
|
||||
{ wxT("wav"), AV_CODEC_ID_FLAC },
|
||||
{ wxT("wav"), AV_CODEC_ID_ADPCM_SWF },
|
||||
{ wxT("wav"), AV_CODEC_ID_VORBIS },
|
||||
|
||||
{ NULL, CODEC_ID_NONE }
|
||||
{ NULL, AV_CODEC_ID_NONE }
|
||||
};
|
||||
|
||||
/// AAC profiles
|
||||
|
|
@ -1120,11 +1120,11 @@ const wxChar *ExportFFmpegOptions::iAACProfileNames[] = {
|
|||
/// List of export types
|
||||
ExposedFormat ExportFFmpegOptions::fmts[] =
|
||||
{
|
||||
{FMT_M4A, wxT("M4A"), wxT("m4a"), wxT("ipod"), 48, AV_VERSION_INT(-1,-1,-1), true, _("M4A (AAC) Files (FFmpeg)"), CODEC_ID_AAC, true},
|
||||
{FMT_AC3, wxT("AC3"), wxT("ac3"), wxT("ac3"), 7, AV_VERSION_INT(0,0,0), false, _("AC3 Files (FFmpeg)"), CODEC_ID_AC3, true},
|
||||
{FMT_AMRNB, wxT("AMRNB"), wxT("amr"), wxT("amr"), 1, AV_VERSION_INT(0,0,0), false, _("AMR (narrow band) Files (FFmpeg)"), CODEC_ID_AMR_NB, true},
|
||||
{FMT_WMA2, wxT("WMA"), wxT("wma"), wxT("asf"), 2, AV_VERSION_INT(52,53,0), false, _("WMA (version 2) Files (FFmpeg)"), CODEC_ID_WMAV2, true},
|
||||
{FMT_OTHER, wxT("FFMPEG"), wxT(""), wxT(""), 255, AV_VERSION_INT(-1,-1,-1), true, _("Custom FFmpeg Export"), CODEC_ID_NONE, true}
|
||||
{FMT_M4A, wxT("M4A"), wxT("m4a"), wxT("ipod"), 48, AV_VERSION_INT(-1,-1,-1), true, _("M4A (AAC) Files (FFmpeg)"), AV_CODEC_ID_AAC, true},
|
||||
{FMT_AC3, wxT("AC3"), wxT("ac3"), wxT("ac3"), 7, AV_VERSION_INT(0,0,0), false, _("AC3 Files (FFmpeg)"), AV_CODEC_ID_AC3, true},
|
||||
{FMT_AMRNB, wxT("AMRNB"), wxT("amr"), wxT("amr"), 1, AV_VERSION_INT(0,0,0), false, _("AMR (narrow band) Files (FFmpeg)"), AV_CODEC_ID_AMR_NB, true},
|
||||
{FMT_WMA2, wxT("WMA"), wxT("wma"), wxT("asf"), 2, AV_VERSION_INT(52,53,0), false, _("WMA (version 2) Files (FFmpeg)"), AV_CODEC_ID_WMAV2, true},
|
||||
{FMT_OTHER, wxT("FFMPEG"), wxT(""), wxT(""), 255, AV_VERSION_INT(-1,-1,-1), true, _("Custom FFmpeg Export"), AV_CODEC_ID_NONE, true}
|
||||
};
|
||||
|
||||
/// Sample rates supported by AAC encoder (must end with zero-element)
|
||||
|
|
@ -1135,84 +1135,84 @@ const int ExportFFmpegOptions::iAACSampleRates[] = { 7350, 8000, 11025, 12000, 1
|
|||
/// Syntax: first, enable a control for each applicable format-codec combination
|
||||
/// then disable it for anything else
|
||||
/// "any" - any format
|
||||
/// CODEC_ID_NONE - any codec
|
||||
/// This list must end with {FALSE,FFmpegExportCtrlID(0),CODEC_ID_NONE,NULL}
|
||||
/// AV_CODEC_ID_NONE - any codec
|
||||
/// This list must end with {FALSE,FFmpegExportCtrlID(0),AV_CODEC_ID_NONE,NULL}
|
||||
ApplicableFor ExportFFmpegOptions::apptable[] =
|
||||
{
|
||||
{TRUE,FEQualityID,CODEC_ID_AAC,"any"},
|
||||
{TRUE,FEQualityID,CODEC_ID_MP3,"any"},
|
||||
{TRUE,FEQualityID,CODEC_ID_VORBIS,"any"},
|
||||
{FALSE,FEQualityID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEQualityID,AV_CODEC_ID_AAC,"any"},
|
||||
{TRUE,FEQualityID,AV_CODEC_ID_MP3,"any"},
|
||||
{TRUE,FEQualityID,AV_CODEC_ID_VORBIS,"any"},
|
||||
{FALSE,FEQualityID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FECutoffID,CODEC_ID_AC3,"any"},
|
||||
{TRUE,FECutoffID,CODEC_ID_AAC,"any"},
|
||||
{TRUE,FECutoffID,CODEC_ID_VORBIS,"any"},
|
||||
{FALSE,FECutoffID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FECutoffID,AV_CODEC_ID_AC3,"any"},
|
||||
{TRUE,FECutoffID,AV_CODEC_ID_AAC,"any"},
|
||||
{TRUE,FECutoffID,AV_CODEC_ID_VORBIS,"any"},
|
||||
{FALSE,FECutoffID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEFrameSizeID,CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEFrameSizeID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEFrameSizeID,AV_CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEFrameSizeID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEProfileID,CODEC_ID_AAC,"any"},
|
||||
{FALSE,FEProfileID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEProfileID,AV_CODEC_ID_AAC,"any"},
|
||||
{FALSE,FEProfileID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FECompLevelID,CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FECompLevelID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FECompLevelID,AV_CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FECompLevelID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEUseLPCID,CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEUseLPCID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEUseLPCID,AV_CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEUseLPCID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FELPCCoeffsID,CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FELPCCoeffsID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FELPCCoeffsID,AV_CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FELPCCoeffsID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEMinPredID,CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEMinPredID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEMinPredID,AV_CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEMinPredID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEMaxPredID,CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEMaxPredID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEMaxPredID,AV_CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEMaxPredID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEPredOrderID,CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEPredOrderID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEPredOrderID,AV_CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEPredOrderID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEMinPartOrderID,CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEMinPartOrderID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEMinPartOrderID,AV_CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEMinPartOrderID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEMaxPartOrderID,CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEMaxPartOrderID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEMaxPartOrderID,AV_CODEC_ID_FLAC,"any"},
|
||||
{FALSE,FEMaxPartOrderID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEMuxRateID,CODEC_ID_NONE,"mpeg"},
|
||||
{TRUE,FEMuxRateID,CODEC_ID_NONE,"vcd"},
|
||||
{TRUE,FEMuxRateID,CODEC_ID_NONE,"vob"},
|
||||
{TRUE,FEMuxRateID,CODEC_ID_NONE,"svcd"},
|
||||
{TRUE,FEMuxRateID,CODEC_ID_NONE,"dvd"},
|
||||
{FALSE,FEMuxRateID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEMuxRateID,AV_CODEC_ID_NONE,"mpeg"},
|
||||
{TRUE,FEMuxRateID,AV_CODEC_ID_NONE,"vcd"},
|
||||
{TRUE,FEMuxRateID,AV_CODEC_ID_NONE,"vob"},
|
||||
{TRUE,FEMuxRateID,AV_CODEC_ID_NONE,"svcd"},
|
||||
{TRUE,FEMuxRateID,AV_CODEC_ID_NONE,"dvd"},
|
||||
{FALSE,FEMuxRateID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEPacketSizeID,CODEC_ID_NONE,"mpeg"},
|
||||
{TRUE,FEPacketSizeID,CODEC_ID_NONE,"vcd"},
|
||||
{TRUE,FEPacketSizeID,CODEC_ID_NONE,"vob"},
|
||||
{TRUE,FEPacketSizeID,CODEC_ID_NONE,"svcd"},
|
||||
{TRUE,FEPacketSizeID,CODEC_ID_NONE,"dvd"},
|
||||
{FALSE,FEPacketSizeID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEPacketSizeID,AV_CODEC_ID_NONE,"mpeg"},
|
||||
{TRUE,FEPacketSizeID,AV_CODEC_ID_NONE,"vcd"},
|
||||
{TRUE,FEPacketSizeID,AV_CODEC_ID_NONE,"vob"},
|
||||
{TRUE,FEPacketSizeID,AV_CODEC_ID_NONE,"svcd"},
|
||||
{TRUE,FEPacketSizeID,AV_CODEC_ID_NONE,"dvd"},
|
||||
{FALSE,FEPacketSizeID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FELanguageID,CODEC_ID_NONE,"matroska"},
|
||||
{TRUE,FELanguageID,CODEC_ID_NONE,"mov"},
|
||||
{TRUE,FELanguageID,CODEC_ID_NONE,"3gp"},
|
||||
{TRUE,FELanguageID,CODEC_ID_NONE,"mp4"},
|
||||
{TRUE,FELanguageID,CODEC_ID_NONE,"psp"},
|
||||
{TRUE,FELanguageID,CODEC_ID_NONE,"3g2"},
|
||||
{TRUE,FELanguageID,CODEC_ID_NONE,"ipod"},
|
||||
{TRUE,FELanguageID,CODEC_ID_NONE,"mpegts"},
|
||||
{FALSE,FELanguageID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FELanguageID,AV_CODEC_ID_NONE,"matroska"},
|
||||
{TRUE,FELanguageID,AV_CODEC_ID_NONE,"mov"},
|
||||
{TRUE,FELanguageID,AV_CODEC_ID_NONE,"3gp"},
|
||||
{TRUE,FELanguageID,AV_CODEC_ID_NONE,"mp4"},
|
||||
{TRUE,FELanguageID,AV_CODEC_ID_NONE,"psp"},
|
||||
{TRUE,FELanguageID,AV_CODEC_ID_NONE,"3g2"},
|
||||
{TRUE,FELanguageID,AV_CODEC_ID_NONE,"ipod"},
|
||||
{TRUE,FELanguageID,AV_CODEC_ID_NONE,"mpegts"},
|
||||
{FALSE,FELanguageID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEBitReservoirID,CODEC_ID_MP3,"any"},
|
||||
{TRUE,FEBitReservoirID,CODEC_ID_WMAV1,"any"},
|
||||
{TRUE,FEBitReservoirID,CODEC_ID_WMAV2,"any"},
|
||||
{FALSE,FEBitReservoirID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEBitReservoirID,AV_CODEC_ID_MP3,"any"},
|
||||
{TRUE,FEBitReservoirID,AV_CODEC_ID_WMAV1,"any"},
|
||||
{TRUE,FEBitReservoirID,AV_CODEC_ID_WMAV2,"any"},
|
||||
{FALSE,FEBitReservoirID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{TRUE,FEVariableBlockLenID,CODEC_ID_WMAV1,"any"},
|
||||
{TRUE,FEVariableBlockLenID,CODEC_ID_WMAV2,"any"},
|
||||
{FALSE,FEVariableBlockLenID,CODEC_ID_NONE,"any"},
|
||||
{TRUE,FEVariableBlockLenID,AV_CODEC_ID_WMAV1,"any"},
|
||||
{TRUE,FEVariableBlockLenID,AV_CODEC_ID_WMAV2,"any"},
|
||||
{FALSE,FEVariableBlockLenID,AV_CODEC_ID_NONE,"any"},
|
||||
|
||||
{FALSE,FFmpegExportCtrlID(0),CODEC_ID_NONE,NULL}
|
||||
{FALSE,FFmpegExportCtrlID(0),AV_CODEC_ID_NONE,NULL}
|
||||
};
|
||||
|
||||
/// Prediction order method - names. Labels are indices of this array.
|
||||
|
|
@ -1278,7 +1278,7 @@ void ExportFFmpegOptions::FetchFormatList()
|
|||
{
|
||||
// Any audio-capable format has default audio codec.
|
||||
// If it doesn't, then it doesn't supports any audio codecs
|
||||
if (ofmt->audio_codec != CODEC_ID_NONE)
|
||||
if (ofmt->audio_codec != AV_CODEC_ID_NONE)
|
||||
{
|
||||
mFormatNames.Add(wxString::FromUTF8(ofmt->name));
|
||||
mFormatLongNames.Add(wxString::Format(wxT("%s - %s"),mFormatNames.Last().c_str(),wxString::FromUTF8(ofmt->long_name).c_str()));
|
||||
|
|
@ -1533,9 +1533,9 @@ int ExportFFmpegOptions::FetchCompatibleCodecList(const wxChar *fmt, AVCodecID i
|
|||
{
|
||||
// Format is found in the list
|
||||
found = 1;
|
||||
if (CompatibilityList[i].codec == CODEC_ID_NONE)
|
||||
if (CompatibilityList[i].codec == AV_CODEC_ID_NONE)
|
||||
{
|
||||
// Format is found in the list and it is compatible with CODEC_ID_NONE (means that it is compatible to anything)
|
||||
// Format is found in the list and it is compatible with AV_CODEC_ID_NONE (means that it is compatible to anything)
|
||||
found = 2;
|
||||
break;
|
||||
}
|
||||
|
|
@ -1605,7 +1605,7 @@ int ExportFFmpegOptions::FetchCompatibleFormatList(AVCodecID id, wxString *selfm
|
|||
// Find all formats compatible to this codec in compatibility list
|
||||
for (int i = 0; CompatibilityList[i].fmt != NULL; i++)
|
||||
{
|
||||
if (CompatibilityList[i].codec == id || CompatibilityList[i].codec == CODEC_ID_NONE)
|
||||
if (CompatibilityList[i].codec == id || CompatibilityList[i].codec == AV_CODEC_ID_NONE)
|
||||
{
|
||||
if ((selfmt != NULL) && (selfmt->Cmp(CompatibilityList[i].fmt) == 0)) index = mShownFormatNames.GetCount();
|
||||
FromList.Add(CompatibilityList[i].fmt);
|
||||
|
|
@ -1787,7 +1787,7 @@ void ExportFFmpegOptions::EnableDisableControls(AVCodec *cdc, wxString *selfmt)
|
|||
{
|
||||
bool codec = false;
|
||||
bool format = false;
|
||||
if (apptable[i].codec == CODEC_ID_NONE) codec = true;
|
||||
if (apptable[i].codec == AV_CODEC_ID_NONE) codec = true;
|
||||
else if (cdc != NULL && apptable[i].codec == cdc->id) codec = true;
|
||||
if (!wxString::FromUTF8(apptable[i].format).Cmp(wxT("any"))) format = true;
|
||||
else if (selfmt != NULL && selfmt->Cmp(wxString::FromUTF8(apptable[i].format)) == 0) format = true;
|
||||
|
|
|
|||
Loading…
Reference in New Issue