summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-27 15:39:38 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-27 15:39:38 +0000
commit8f07e027378103deb3b0eade024f9e7c50af73db (patch)
tree90de89e7cdd0434cfa170943b62839375e7b24fe
parent2f8386388329aee07197b885c1d1d65eba81c6b1 (diff)
downloadmpv-8f07e027378103deb3b0eade024f9e7c50af73db.tar.bz2
mpv-8f07e027378103deb3b0eade024f9e7c50af73db.tar.xz
fl32: BE float32 PCM audio in mov files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14056 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--etc/codecs.conf1
-rw-r--r--libmpcodecs/ad_pcm.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index baa3240637..0500b13ab5 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2120,6 +2120,7 @@ audiocodec pcm
format 0x20776172 ; "raw " (MOV files)
format 0x736f7774 ; "twos" (MOV files)
format 0x74776f73 ; "sowt" (MOV files)
+ format 0x32336c66 ; "fl32" (MOV files)
;;;; these are for hardware support only: (alaw,ulaw,ima-adpcm,mpeg,ac3)
; format 0x6
; format 0x7
diff --git a/libmpcodecs/ad_pcm.c b/libmpcodecs/ad_pcm.c
index 1ceca67293..8288a69612 100644
--- a/libmpcodecs/ad_pcm.c
+++ b/libmpcodecs/ad_pcm.c
@@ -57,6 +57,10 @@ static int init(sh_audio_t *sh_audio)
sh_audio->ds->ss_mul= sh_audio->samplesize * sh_audio->channels;
#endif
break;
+ case 0x32336c66: // 'fl32', bigendian float32
+ sh_audio->sample_format=AFMT_AF_FLAGS | AF_FORMAT_BE | AF_FORMAT_F;
+ sh_audio->samplesize=4;
+ break;
default: if(sh_audio->samplesize!=2) sh_audio->sample_format=AFMT_U8;
}
return 1;