From 9be9ca233dd1051fd5f98662b1e61e8e21cac460 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Fri, 11 May 2012 01:05:28 +1000 Subject: [dvdplayer] updated SAMPLE_FMT_* to AV_SAMPLE_FMT_* --- xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp index dc90af7636..1b35eeb517 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp @@ -276,11 +276,11 @@ enum AEDataFormat CDVDAudioCodecFFmpeg::GetDataFormat() { switch(m_pCodecContext->sample_fmt) { - case SAMPLE_FMT_U8 : return AE_FMT_U8; - case SAMPLE_FMT_S16: return AE_FMT_S16NE; - case SAMPLE_FMT_S32: return AE_FMT_S32NE; - case SAMPLE_FMT_FLT: return AE_FMT_FLOAT; - case SAMPLE_FMT_DBL: return AE_FMT_DOUBLE; + case AV_SAMPLE_FMT_U8 : return AE_FMT_U8; + case AV_SAMPLE_FMT_S16: return AE_FMT_S16NE; + case AV_SAMPLE_FMT_S32: return AE_FMT_S32NE; + case AV_SAMPLE_FMT_FLT: return AE_FMT_FLOAT; + case AV_SAMPLE_FMT_DBL: return AE_FMT_DOUBLE; default: assert(false); return AE_FMT_INVALID; -- cgit v1.2.3