summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-13 23:32:36 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-13 23:32:36 +0000
commit68f49b8512482a9808f0869f5926521d934a09e3 (patch)
tree9db60f0583b25b2fb8e0a003404ac3b00e42a8d2 /libmpcodecs
parent25b4f3da22fca514334cf56f57002aecb3cb47f2 (diff)
downloadmpv-68f49b8512482a9808f0869f5926521d934a09e3.tar.bz2
mpv-68f49b8512482a9808f0869f5926521d934a09e3.tar.xz
in24/in32/fl32 little/big-endian QuickTime PCM audio support
approved by rxt git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17859 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ad_pcm.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/libmpcodecs/ad_pcm.c b/libmpcodecs/ad_pcm.c
index ce1ba6245e..67a7a405c6 100644
--- a/libmpcodecs/ad_pcm.c
+++ b/libmpcodecs/ad_pcm.c
@@ -65,14 +65,34 @@ static int init(sh_audio_t *sh_audio)
sh_audio->sample_format=AF_FORMAT_FLOAT_BE;
sh_audio->samplesize=4;
break;
+ case 0x666c3332: // '23lf', little endian float32, MPlayer internal fourCC
+ sh_audio->sample_format=AF_FORMAT_FLOAT_LE;
+ sh_audio->samplesize=4;
+ break;
+/* case 0x34366c66: // 'fl64', bigendian float64
+ sh_audio->sample_format=AF_FORMAT_FLOAT_BE;
+ sh_audio->samplesize=8;
+ break;
+ case 0x666c3634: // '46lf', little endian float64, MPlayer internal fourCC
+ sh_audio->sample_format=AF_FORMAT_FLOAT_LE;
+ sh_audio->samplesize=8;
+ break;*/
case 0x34326e69: // 'in24', bigendian int24
sh_audio->sample_format=AF_FORMAT_S24_BE;
sh_audio->samplesize=3;
break;
+ case 0x696e3234: // '42ni', little endian int24, MPlayer internal fourCC
+ sh_audio->sample_format=AF_FORMAT_S24_LE;
+ sh_audio->samplesize=3;
+ break;
case 0x32336e69: // 'in32', bigendian int32
sh_audio->sample_format=AF_FORMAT_S32_BE;
sh_audio->samplesize=4;
break;
+ case 0x696e3332: // '23ni', little endian int32, MPlayer internal fourCC
+ sh_audio->sample_format=AF_FORMAT_S32_LE;
+ sh_audio->samplesize=4;
+ break;
default: if(sh_audio->samplesize!=2) sh_audio->sample_format=AF_FORMAT_U8;
}
if (!sh_audio->samplesize) // this would cause MPlayer to hang later