From 49f42542c64e0af58605774096fea8ae08f09ccb Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 4 May 2015 15:49:22 -0400 Subject: [PATCH] FS-7519: [mod_avformat] fix ffmpeg symbol collision --- src/mod/formats/mod_avformat/mod_avformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mod/formats/mod_avformat/mod_avformat.c b/src/mod/formats/mod_avformat/mod_avformat.c index 303f1c5a3a..cb4563cd93 100644 --- a/src/mod/formats/mod_avformat/mod_avformat.c +++ b/src/mod/formats/mod_avformat/mod_avformat.c @@ -155,7 +155,7 @@ static void log_packet(const AVFormatContext *fmt_ctx, const AVPacket *pkt) // pkt->stream_index); } -static int avformat_alloc_output_context2(AVFormatContext **avctx, AVOutputFormat *oformat, +static int mod_avformat_alloc_output_context2(AVFormatContext **avctx, AVOutputFormat *oformat, const char *format, const char *filename) { AVFormatContext *s = avformat_alloc_context(); @@ -633,7 +633,7 @@ SWITCH_STANDARD_APP(record_av_function) switch_buffer_create_dynamic(&buffer, 8192, 65536, 0); av_register_all(); - avformat_alloc_output_context2(&fc, NULL, format, data); + mod_avformat_alloc_output_context2(&fc, NULL, format, data); if (!fc) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not deduce output format from file extension\n"); @@ -1536,7 +1536,7 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa return SWITCH_STATUS_SUCCESS; } - avformat_alloc_output_context2(&context->fc, NULL, format, (char *)file); + mod_avformat_alloc_output_context2(&context->fc, NULL, format, (char *)file); if (!context->fc) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not deduce output format from file extension\n");