From 071d24e19de6c2c0278e80f21e10572a4d694ddf Mon Sep 17 00:00:00 2001 From: wm4 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. --- audio/decode/ad.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'audio/decode/ad.c') diff --git a/audio/decode/ad.c b/audio/decode/ad.c index f091914244..9af7112bf0 100644 --- a/audio/decode/ad.c +++ b/audio/decode/ad.c @@ -33,7 +33,6 @@ extern const ad_functions_t mpcodecs_ad_mpg123; extern const ad_functions_t mpcodecs_ad_ffmpeg; -extern const ad_functions_t mpcodecs_ad_dvdpcm; extern const ad_functions_t mpcodecs_ad_spdif; const ad_functions_t * const mpcodecs_ad_drivers[] = @@ -42,7 +41,6 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = &mpcodecs_ad_mpg123, #endif &mpcodecs_ad_ffmpeg, - &mpcodecs_ad_dvdpcm, &mpcodecs_ad_spdif, NULL }; -- cgit v1.2.3