kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-14 11:06:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2840 from signalwire/ffmpeg_60

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

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

@ -416,6 +416,7 @@ static int interrupt_cb(void *cp)
}
#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_6_V)
static int mod_avformat_alloc_output_context2(AVFormatContext **avctx, const char *format, const char *filename, av_file_context_t *context)
{
AVFormatContext *s = avformat_alloc_context();
@ -489,6 +490,7 @@ error:
return ret;
}
#endif
static int write_frame(AVFormatContext *fmt_ctx, const AVRational *time_base, AVStream *st, AVPacket *pkt)
{
@ -2235,7 +2237,16 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
return SWITCH_STATUS_SUCCESS;
}
#if (LIBAVFORMAT_VERSION_MAJOR < LIBAVFORMAT_6_V)
mod_avformat_alloc_output_context2(&context->fc, format, (char *)file, context);
#else
avformat_alloc_output_context2(&context->fc, NULL, format, (char *)file);
if (context->fc) {
context->fc->interrupt_callback.callback = interrupt_cb;
context->fc->interrupt_callback.opaque = context;
}
#endif
if (!context->fc) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not deduce output format from file extension\n");

1
src/mod/applications/mod_av/mod_av.h
View File

@ -42,6 +42,7 @@
#define LIBAVCODEC_V 59
#define LIBAVFORMAT_V 59
#define LIBAVFORMAT_6_V 60
#define LIBAVUTIL_V 57
struct mod_av_globals {