Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-25 15:53:52 +02:00
Code Issues Releases Wiki Activity

Add support for libav 9.

Browse Source
This commit is contained in:
benjamin.drung@gmail.com
2014-05-23 20:43:08 +00:00
parent 89907256eb
commit 463da8e816
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/export/ExportFFmpeg.cpp
View File

@@ -286,7 +286,11 @@ bool ExportFFmpeg::Init(const char *shortname, AudacityProject *project, Tags *m
memcpy(mEncFormatCtx->filename, OSINPUT(mName), strlen(OSINPUT(mName))+1);
// At the moment Audacity can export only one audio stream
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 10, 0))
if ((mEncAudioStream = av_new_stream(mEncFormatCtx, 1)) == NULL)
#else
if ((mEncAudioStream = avformat_new_stream(mEncFormatCtx, NULL)) == NULL)
#endif
{
wxLogError(wxT("FFmpeg : ERROR - Can't add audio stream to output file \"%s\"."), mName.c_str());
return false;

10
src/export/ExportFFmpegDialogs.cpp
View File

@@ -839,8 +839,10 @@ CompatibilityEntry ExportFFmpegOptions::CompatibilityList[] =
{ wxT("asf"), CODEC_ID_IMC },
{ wxT("asf"), CODEC_ID_AC3 },
{ wxT("asf"), CODEC_ID_DTS },
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || (LIBAVCODEC_VERSION_MAJOR == 53)
{ wxT("asf"), CODEC_ID_SONIC },
{ wxT("asf"), CODEC_ID_SONIC_LS },
#endif
{ wxT("asf"), CODEC_ID_FLAC },
{ wxT("asf"), CODEC_ID_ADPCM_SWF },
{ wxT("asf"), CODEC_ID_VORBIS },
@@ -875,8 +877,10 @@ CompatibilityEntry ExportFFmpegOptions::CompatibilityList[] =
{ wxT("avi"), CODEC_ID_IMC },
{ wxT("avi"), CODEC_ID_AC3 },
{ wxT("avi"), CODEC_ID_DTS },
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || (LIBAVCODEC_VERSION_MAJOR == 53)
{ wxT("avi"), CODEC_ID_SONIC },
{ wxT("avi"), CODEC_ID_SONIC_LS },
#endif
{ wxT("avi"), CODEC_ID_FLAC },
{ wxT("avi"), CODEC_ID_ADPCM_SWF },
{ wxT("avi"), CODEC_ID_VORBIS },
@@ -924,8 +928,10 @@ CompatibilityEntry ExportFFmpegOptions::CompatibilityList[] =
{ wxT("matroska"), CODEC_ID_IMC },
{ wxT("matroska"), CODEC_ID_AC3 },
{ wxT("matroska"), CODEC_ID_DTS },
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || (LIBAVCODEC_VERSION_MAJOR == 53)
{ wxT("matroska"), CODEC_ID_SONIC },
{ wxT("matroska"), CODEC_ID_SONIC_LS },
#endif
{ wxT("matroska"), CODEC_ID_FLAC },
{ wxT("matroska"), CODEC_ID_ADPCM_SWF },
{ wxT("matroska"), CODEC_ID_VORBIS },
@@ -1032,8 +1038,10 @@ CompatibilityEntry ExportFFmpegOptions::CompatibilityList[] =
{ wxT("nut"), CODEC_ID_IMC },
{ wxT("nut"), CODEC_ID_AC3 },
{ wxT("nut"), CODEC_ID_DTS },
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || (LIBAVCODEC_VERSION_MAJOR == 53)
{ wxT("nut"), CODEC_ID_SONIC },
{ wxT("nut"), CODEC_ID_SONIC_LS },
#endif
{ wxT("nut"), CODEC_ID_FLAC },
{ wxT("nut"), CODEC_ID_ADPCM_SWF },
{ wxT("nut"), CODEC_ID_VORBIS },
@@ -1082,8 +1090,10 @@ CompatibilityEntry ExportFFmpegOptions::CompatibilityList[] =
{ wxT("wav"), CODEC_ID_IMC },
{ wxT("wav"), CODEC_ID_AC3 },
{ wxT("wav"), CODEC_ID_DTS },
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || (LIBAVCODEC_VERSION_MAJOR == 53)
{ wxT("wav"), CODEC_ID_SONIC },
{ wxT("wav"), CODEC_ID_SONIC_LS },
#endif
{ wxT("wav"), CODEC_ID_FLAC },
{ wxT("wav"), CODEC_ID_ADPCM_SWF },
{ wxT("wav"), CODEC_ID_VORBIS },