From d921c4969bd947bd11b5b33e9255417c63c15749 Mon Sep 17 00:00:00 2001 From: "benjamin.drung@gmail.com" Date: Tue, 3 Jun 2014 20:16:55 +0000 Subject: [PATCH] Fix dynamic FFmpeg import. The symbols av_dict_get, av_dict_set, and av_get_bytes_per_sample are defined in libavutil, but not in libavformat or libavcodec. --- src/FFmpeg.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp index 06cc4da67..5e03bca5f 100644 --- a/src/FFmpeg.cpp +++ b/src/FFmpeg.cpp @@ -868,8 +868,6 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, bool WXUNUSED(showerr)) FFMPEG_INITDYN(avformat, av_codec_get_tag); FFMPEG_INITDYN(avformat, avformat_version); FFMPEG_INITDYN(avformat, avformat_open_input); - FFMPEG_INITDYN(avformat, av_dict_get); - FFMPEG_INITDYN(avformat, av_dict_set); FFMPEG_INITDYN(avformat, avio_size); FFMPEG_INITDYN(avformat, avio_alloc_context); FFMPEG_INITALT(avformat, av_guess_format, guess_format); @@ -888,9 +886,11 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, bool WXUNUSED(showerr)) FFMPEG_INITDYN(avcodec, av_codec_next); FFMPEG_INITDYN(avcodec, av_codec_is_encoder); FFMPEG_INITDYN(avcodec, avcodec_fill_audio_frame); - FFMPEG_INITDYN(avcodec, av_get_bytes_per_sample); FFMPEG_INITDYN(avutil, av_free); + FFMPEG_INITDYN(avutil, av_dict_get); + FFMPEG_INITDYN(avutil, av_dict_set); + FFMPEG_INITDYN(avutil, av_get_bytes_per_sample); FFMPEG_INITDYN(avutil, av_log_set_callback); FFMPEG_INITDYN(avutil, av_log_default_callback); FFMPEG_INITDYN(avutil, av_fifo_alloc);