kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-13 10:37:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2843 from signalwire/ffmpeg71

Browse Source 
[mod_av] Add support for FFmpeg 7.1
This commit is contained in:
Andrey Volk 2025-07-11 17:12:42 +03:00 committed by GitHub
commit 98ce256d9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/applications/mod_av/avformat.c
View File

@ -557,7 +557,21 @@ static switch_status_t add_stream(av_file_context_t *context, MediaStream *mst,
switch ((*codec)->type) { switch ((*codec)->type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 13, 100)
/*
Changelog says 61.12.100 but commit changes version actually to 61.13.100
https://github.com/FFmpeg/FFmpeg/commit/3305767560a6303f474fffa3afb10c500059b455
*/
{
const enum AVSampleFormat *sample_fmts = NULL;
int fmts_count = 0;
int ret = avcodec_get_supported_config(c, *codec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, (const void**)&sample_fmts, &fmts_count);
c->sample_fmt = (ret >= 0 && fmts_count && sample_fmts) ? sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
}
#else
c->sample_fmt = (*codec)->sample_fmts ? (*codec)->sample_fmts[0] : AV_SAMPLE_FMT_FLTP; c->sample_fmt = (*codec)->sample_fmts ? (*codec)->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
#endif
c->bit_rate = 128000; c->bit_rate = 128000;
c->sample_rate = mst->sample_rate = context->handle->samplerate; c->sample_rate = mst->sample_rate = context->handle->samplerate;
#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V) #if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_V)