summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2011-03-12 10:50:14 +0000
committerUoti Urpala <uau@mplayer2.org>2011-04-13 03:17:05 +0300
commite43e0de9e629c780bfe14af50c4c48b220495de4 (patch)
tree4cde52fe63a8c4785e1675683ea6671be88af860 /libmpcodecs
parentcb61c0f2d4c7a7deb84ed4db6a41c2c6bdd1a055 (diff)
downloadmpv-e43e0de9e629c780bfe14af50c4c48b220495de4.tar.bz2
mpv-e43e0de9e629c780bfe14af50c4c48b220495de4.tar.xz
ad_pcm, codecs.conf: support 'lpcm' in mov and float in aiff
Support 'lpcm' in mov files, has audible (clipping?) artefacts on some systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33075 b3059339-0415-0410-9bf9-f77b7e298cf2 Support 32bit big endian float pcm in aiff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33076 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ad_pcm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpcodecs/ad_pcm.c b/libmpcodecs/ad_pcm.c
index 29e78d69af..1920f396f4 100644
--- a/libmpcodecs/ad_pcm.c
+++ b/libmpcodecs/ad_pcm.c
@@ -86,10 +86,12 @@ static int init(sh_audio_t * sh_audio)
sh_audio->sample_format = AF_FORMAT_S8;
break;
case 0x32336c66: // 'fl32', bigendian float32
+ case 0x32334C46: // 'FL32', bigendian float32 in aiff
sh_audio->sample_format = AF_FORMAT_FLOAT_BE;
sh_audio->samplesize = 4;
break;
case 0x666c3332: // '23lf', little endian float32, MPlayer internal fourCC
+ case 0x6D63706C: // 'lpcm'
sh_audio->sample_format = AF_FORMAT_FLOAT_LE;
sh_audio->samplesize = 4;
break;