summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-12-09 18:58:20 +0100
committerwm4 <wm4@nowhere>2012-12-11 00:37:54 +0100
commit071d24e19de6c2c0278e80f21e10572a4d694ddf (patch)
tree5da015dbb8a0a22211e28aae7a334b2cdbac1e34 /etc
parent2dd2d9bcfcf57b9921c9ef360746dd59c45574fd (diff)
downloadmpv-071d24e19de6c2c0278e80f21e10572a4d694ddf.tar.bz2
mpv-071d24e19de6c2c0278e80f21e10572a4d694ddf.tar.xz
audio/decode: remove ad_dvdpcm and use ad_lavc for DVD PCM
ad_dvdpcm reads MPEG specific headers directly (passed through codecdata by demux_mpg), so you couldn't use ffmpeg's "pcm_dvd" with demux_mpg. Change demux_mpg to set the correct audio parameters directly. The code for this is taken from ad_dvdpcm. ad_dvdpcm is evil because it still does partial packet reads (with demux_read_data()), and it's redundant to libavcodec anyway.
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 3988dd6cd1..2d3d3cefdc 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1953,7 +1953,8 @@ audiocodec dvdpcm
info "Uncompressed DVD/VOB LPCM"
status working
format 0x10001
- driver dvdpcm
+ driver ffmpeg
+ dll pcm_dvd
audiocodec fflpcm
info "Blu-ray LPCM"