From 7a47f6fedd36594e5e186902aeabbf04c58ad1f3 Mon Sep 17 00:00:00 2001 From: "benjamin.drung@gmail.com" Date: Fri, 23 May 2014 20:37:54 +0000 Subject: [PATCH] Prefer newer av_get_bits_per_sample_fmt over av_get_bits_per_sample_format. --- src/FFmpeg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp index aa1be8477..9e4000f1a 100644 --- a/src/FFmpeg.cpp +++ b/src/FFmpeg.cpp @@ -377,7 +377,7 @@ int import_ffmpeg_decode_frame(streamContext *sc, bool flushing) } sc->m_samplefmt = sc->m_codecCtx->sample_fmt; - sc->m_samplesize = av_get_bits_per_sample_format(sc->m_samplefmt) / 8; + sc->m_samplesize = av_get_bits_per_sample_fmt(sc->m_samplefmt) / 8; int channels = sc->m_codecCtx->channels; unsigned int newsize = sc->m_samplesize * frame->nb_samples * channels; @@ -908,7 +908,7 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, bool WXUNUSED(showerr)) FFMPEG_INITDYN(avcodec, av_codec_is_encoder); FFMPEG_INITDYN(avcodec, avcodec_fill_audio_frame); - FFMPEG_INITALT(avcodec, av_get_bits_per_sample_format, av_get_bits_per_sample_fmt); + FFMPEG_INITALT(avcodec, av_get_bits_per_sample_fmt, av_get_bits_per_sample_format); FFMPEG_INITDYN(avutil, av_free); FFMPEG_INITDYN(avutil, av_log_set_callback);