From 071d24e19de6c2c0278e80f21e10572a4d694ddf Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 9 Dec 2012 18:58:20 +0100
Subject: 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.
---
 etc/codecs.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'etc')

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"
-- 
cgit v1.2.3