Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-31 19:44:54 +02:00
Code Issues Releases Wiki Activity

Update for FFmpeg 3.5

Browse Source
This commit is contained in:
Darrell Walisser
2018-01-26 12:13:54 -05:00
committed by Paul Licameli
parent c1babb3bb3
commit 3d4a357f95
5 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/export/ExportFFmpegDialogs.cpp
View File

@@ -931,7 +931,9 @@ CompatibilityEntry ExportFFmpegOptions::CompatibilityList[] =
{ wxT("asf"), AV_CODEC_ID_ADPCM_G726 },
{ wxT("asf"), AV_CODEC_ID_MP2 },
{ wxT("asf"), AV_CODEC_ID_MP3 },
#if LIBAVCODEC_VERSION_MAJOR < 58
{ wxT("asf"), AV_CODEC_ID_VOXWARE },
#endif
{ wxT("asf"), AV_CODEC_ID_AAC },
{ wxT("asf"), AV_CODEC_ID_WMAV1 },
{ wxT("asf"), AV_CODEC_ID_WMAV2 },
@@ -965,7 +967,9 @@ CompatibilityEntry ExportFFmpegOptions::CompatibilityList[] =
{ wxT("avi"), AV_CODEC_ID_ADPCM_G726 },
{ wxT("avi"), AV_CODEC_ID_MP2 },
{ wxT("avi"), AV_CODEC_ID_MP3 },
#if LIBAVCODEC_VERSION_MAJOR < 58
{ wxT("avi"), AV_CODEC_ID_VOXWARE },
#endif
{ wxT("avi"), AV_CODEC_ID_AAC },
{ wxT("avi"), AV_CODEC_ID_WMAV1 },
{ wxT("avi"), AV_CODEC_ID_WMAV2 },
@@ -1012,7 +1016,9 @@ CompatibilityEntry ExportFFmpegOptions::CompatibilityList[] =
{ wxT("matroska"), AV_CODEC_ID_ADPCM_G726 },
{ wxT("matroska"), AV_CODEC_ID_MP2 },
{ wxT("matroska"), AV_CODEC_ID_MP3 },
#if LIBAVCODEC_VERSION_MAJOR < 58
{ wxT("matroska"), AV_CODEC_ID_VOXWARE },
#endif
{ wxT("matroska"), AV_CODEC_ID_AAC },
{ wxT("matroska"), AV_CODEC_ID_WMAV1 },
{ wxT("matroska"), AV_CODEC_ID_WMAV2 },
@@ -1118,7 +1124,9 @@ CompatibilityEntry ExportFFmpegOptions::CompatibilityList[] =
{ wxT("nut"), AV_CODEC_ID_ADPCM_G726 },
{ wxT("nut"), AV_CODEC_ID_MP2 },
{ wxT("nut"), AV_CODEC_ID_MP3 },
#if LIBAVCODEC_VERSION_MAJOR < 58
{ wxT("nut"), AV_CODEC_ID_VOXWARE },
#endif
{ wxT("nut"), AV_CODEC_ID_AAC },
{ wxT("nut"), AV_CODEC_ID_WMAV1 },
{ wxT("nut"), AV_CODEC_ID_WMAV2 },
@@ -1166,7 +1174,9 @@ CompatibilityEntry ExportFFmpegOptions::CompatibilityList[] =
{ wxT("wav"), AV_CODEC_ID_ADPCM_G726 },
{ wxT("wav"), AV_CODEC_ID_MP2 },
{ wxT("wav"), AV_CODEC_ID_MP3 },
#if LIBAVCODEC_VERSION_MAJOR < 58
{ wxT("wav"), AV_CODEC_ID_VOXWARE },
#endif
{ wxT("wav"), AV_CODEC_ID_AAC },
{ wxT("wav"), AV_CODEC_ID_WMAV1 },
{ wxT("wav"), AV_CODEC_ID_WMAV2 },