changeset 35866:24349a6cdad7

Revert r35955, the resampling API in lavc is still available.
author cehoyos
date Wed, 13 Mar 2013 10:13:13 +0000
parents 3b0d5a26815a
children 6ac59489c815
files Makefile libaf/af.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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     \
--- 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,