summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-02 19:30:34 +0200
committerwm4 <wm4@nowhere>2012-09-18 21:04:47 +0200
commitee65b39cbe8a1df6bf4b2eaeef413c881ae16456 (patch)
tree6877c6130a51a67ae12f08272a18c8548dc05ba5 /etc
parent53bfaecd40aa7b34dcc9c90064e36f2ffe227fc0 (diff)
downloadmpv-ee65b39cbe8a1df6bf4b2eaeef413c881ae16456.tar.bz2
mpv-ee65b39cbe8a1df6bf4b2eaeef413c881ae16456.tar.xz
ad_pcm: add back raw decoder
This was removed in commit 6a26b4a66504. Add it back, because it was needed by demuxer_rawaudio and for PCM audio with demuxers other than demux_lavf. (In practice, this broke rawaudio and PCM-in-Matroska only.) Unlike with raw video, there is no single raw audio "decoder" in libavcodec. Instead of trying to mess raw audio input into ad_ffmpeg using a table to map audio formats to the respective libavcodec decoders, it seems advantageous to simply add back ad_pcm.
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf30
1 files changed, 30 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 879389acbd..ccc7943d29 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1753,6 +1753,36 @@ audiocodec ffnellymoser
driver ffmpeg
dll "nellymoser"
+audiocodec pcm
+ info "Uncompressed PCM"
+ status working
+ format 0x0
+ format 0x1
+ format 0x3 ; IEEE float
+ format 0xfffe ; Extended
+ fourcc "raw " ; (MOV files)
+ fourcc twos ; (MOV files)
+ fourcc sowt ; (MOV files)
+ fourcc fl32 ; (MOV files)
+ fourcc 23lf ; (MOV files)
+; fourcc fl64 ; (MOV files)
+; fourcc 46lf ; (MOV files)
+ fourcc NONE ; (MOV files from Kodak CX6320)
+ fourcc in24 ; (MOV files)
+ fourcc 42ni ; (MOV files)
+ fourcc in32 ; (MOV files)
+ fourcc 23ni ; (MOV files)
+ fourcc lpcm ; (MOV files)
+ fourcc FL32 ; (aiff files)
+;;;; these are for hardware support only: (alaw,ulaw,ima-adpcm,mpeg,ac3)
+; format 0x6
+; format 0x7
+; format 0x11
+; format 0x50
+; format 0x2000
+;;;;
+ driver pcm
+
audiocodec ffpcmdaud
info "D-Cinema audio (FFmpeg)"
status untested