# HG changeset patch # User cehoyos # Date 1363169593 0 # Node ID 24349a6cdad72fb263f74ee6c85faca588d1b77e # Parent 3b0d5a26815aedbe06c8316f174d22caaaec3b22 Revert r35955, the resampling API in lavc is still available. diff -r 3b0d5a26815a -r 24349a6cdad7 Makefile --- a/Makefile Wed Mar 13 07:46:40 2013 +0000 +++ b/Makefile Wed Mar 13 10:13:13 2013 +0000 @@ -71,6 +71,7 @@ SRCS_COMMON-$(FFMPEG) += av_helpers.c \ av_opts.c \ libaf/af_lavcac3enc.c \ + libaf/af_lavcresample.c \ libmpcodecs/ad_ffmpeg.c \ libmpcodecs/ad_spdif.c \ libmpcodecs/vd_ffmpeg.c \ diff -r 3b0d5a26815a -r 24349a6cdad7 libaf/af.c --- a/libaf/af.c Wed Mar 13 07:46:40 2013 +0000 +++ b/libaf/af.c Wed Mar 13 10:13:13 2013 +0000 @@ -74,7 +74,7 @@ &af_info_extrastereo, #ifdef CONFIG_FFMPEG &af_info_lavcac3enc, -// &af_info_lavcresample, + &af_info_lavcresample, #endif &af_info_sweep, &af_info_hrtf,