summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-02 20:13:12 +0200
committerwm4 <wm4@nowhere>2012-09-18 21:07:29 +0200
commit1ba5a8f283e3894158f12f025035903e13d0f8ae (patch)
tree7ff315850990353487a332cfc9f2917f6d43ed14 /etc
parent1f5635d02cf1ad89025e5409fc05b718cbb04935 (diff)
downloadmpv-1ba5a8f283e3894158f12f025035903e13d0f8ae.tar.bz2
mpv-1ba5a8f283e3894158f12f025035903e13d0f8ae.tar.xz
rawaudio: use mplayer audio format for format option
The rawaudio demuxer had a rather hard to use way to set the audio format with the --rawaudio=format=value option. The user had to pass a numeric value, which then was set as wFormatTag member in the WAVEFORMATEX header. Make it use the mplayer audio format (the same as --af=format=value). Add a new internal pseudo audio codec tag, which is hopefully unused, which makes ad_pcm use the value in wFormatTag as internal mplayer audio format. Playing non-PCM formats is disabled. (At least AC3 can be played directly.)
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index ccc7943d29..0b2fcb793e 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1774,6 +1774,7 @@ audiocodec pcm
fourcc 23ni ; (MOV files)
fourcc lpcm ; (MOV files)
fourcc FL32 ; (aiff files)
+ fourcc MPaf ; internal MPlayer FourCC for demux_rawaudio
;;;; these are for hardware support only: (alaw,ulaw,ima-adpcm,mpeg,ac3)
; format 0x6
; format 0x7