xbmc: add PR2861

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-06-13 21:10:38 +02:00
parent 7e889d3ad0
commit a49ebc9a03

View File

@ -0,0 +1,26 @@
From aa12d4ae8315ef4b14c01e3595ea984f8c605639 Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Mon, 10 Jun 2013 22:20:13 +0200
Subject: [PATCH] AE: Workaround (ugly) non existing channel maps in old ffmpeg
(workarounds: #14407)
---
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
index 985a01c..880b710 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
@@ -319,6 +319,8 @@ void CDVDAudioCodecFFmpeg::BuildChannelMap()
{
CLog::Log(LOGINFO, "CDVDAudioCodecFFmpeg::GetChannelMap - FFmpeg reported %d channels, but the layout contains %d ignoring", m_pCodecContext->channels, bits);
layout = m_dllAvUtil.av_get_default_channel_layout(m_pCodecContext->channels);
+ while(layout == 0 && m_pCodecContext->channels > 2)
+ layout = m_dllAvUtil.av_get_default_channel_layout(--m_pCodecContext->channels);
}
m_channelLayout.Reset();
--
1.8.1.6