diff options
| -rw-r--r-- | etc/codecs.conf | 2 | ||||
| -rw-r--r-- | libmpcodecs/ad_pcm.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 83476a2c6a..ee758d6037 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4136,6 +4136,8 @@ audiocodec pcm format 0x696e3234 ; "42ni" (MOV files) format 0x32336e69 ; "in32" (MOV files) format 0x696e3332 ; "23ni" (MOV files) + format 0x6D63706C ; "lpcm" (MOV files) + format 0x32334C46 ; 'FL32" (aiff 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 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; |