[MPlayer-cvslog] r35960 - in trunk: Makefile libaf/af.c

[cehoyos]

Author: cehoyos
Date: Wed Mar 13 11:13:13 2013
New Revision: 35960

Log:
Revert r35955, the resampling API in lavc is still available.

Modified:
   trunk/Makefile
   trunk/libaf/af.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Mar 13 08:46:40 2013	(r35959)
+++ trunk/Makefile	Wed Mar 13 11:13:13 2013	(r35960)
@@ -71,6 +71,7 @@ SRCS_COMMON-$(FASTMEMCPY)            += 
 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     \

Modified: trunk/libaf/af.c
==============================================================================
--- trunk/libaf/af.c	Wed Mar 13 08:46:40 2013	(r35959)
+++ trunk/libaf/af.c	Wed Mar 13 11:13:13 2013	(r35960)
@@ -74,7 +74,7 @@ static const af_info_t * const filter_li
    &af_info_extrastereo,
 #ifdef CONFIG_FFMPEG
    &af_info_lavcac3enc,
-//   &af_info_lavcresample,
+   &af_info_lavcresample,
 #endif
    &af_info_sweep,
    &af_info_hrtf,