summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-09 07:46:20 +0000
committerulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-09 07:46:20 +0000
commit78f37058ff6658656f52fe6c82debb48723ba439 (patch)
tree680e402e225bba75d48f9a61bc380527dae8b654 /libmpcodecs
parent74bb6be453fb896a48d16254cf55449b58052d0b (diff)
downloadmpv-78f37058ff6658656f52fe6c82debb48723ba439.tar.bz2
mpv-78f37058ff6658656f52fe6c82debb48723ba439.tar.xz
Fix channel order for ffmpeg flac codec.
This patch comes from Andrew de Quincey <adq_dvb at lidskialf dot net>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27732 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ad_ffmpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
index 64702f7825..c0a638db8c 100644
--- a/libmpcodecs/ad_ffmpeg.c
+++ b/libmpcodecs/ad_ffmpeg.c
@@ -177,6 +177,8 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_LIBA52_DEFAULT;
else if (!strcasecmp(codec, "vorbis"))
src_ch_layout = AF_CHANNEL_LAYOUT_VORBIS_DEFAULT;
+ else if (!strcasecmp(codec, "flac"))
+ src_ch_layout = AF_CHANNEL_LAYOUT_FLAC_DEFAULT;
else
src_ch_layout = AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT;
reorder_channel_nch(buf, src_ch_layout,