[MPlayer-cvslog] r33075 - in trunk: etc/codecs.conf libmpcodecs/ad_pcm.c

[cehoyos]

Author: cehoyos
Date: Sat Mar 12 11:50:14 2011
New Revision: 33075

Log:
Support 'lpcm' in mov files, has audible (clipping?) artefacts on some systems.

Modified:
   trunk/etc/codecs.conf
   trunk/libmpcodecs/ad_pcm.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Fri Mar 11 17:06:43 2011	(r33074)
+++ trunk/etc/codecs.conf	Sat Mar 12 11:50:14 2011	(r33075)
@@ -4182,6 +4182,7 @@ audiocodec pcm
   format 0x696e3234  ; "42ni" (MOV files)
   format 0x32336e69  ; "in32" (MOV files)
   format 0x696e3332  ; "23ni" (MOV files)
+  format 0x6D63706C  ; "lpcm" (MOV files)
 ;;;; these are for hardware support only:  (alaw,ulaw,ima-adpcm,mpeg,ac3)
 ;  format 0x6
 ;  format 0x7

Modified: trunk/libmpcodecs/ad_pcm.c
==============================================================================
--- trunk/libmpcodecs/ad_pcm.c	Fri Mar 11 17:06:43 2011	(r33074)
+++ trunk/libmpcodecs/ad_pcm.c	Sat Mar 12 11:50:14 2011	(r33075)
@@ -81,6 +81,7 @@ static int init(sh_audio_t * sh_audio)
         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;