Modify av_audio_convert() to use AVAudioConvert context struct; add av_audio_convert_...

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 78cf971871b10f537c77bb3c97057dc25218867d..213f1846a0a2e95cd83b933e28256b0e9b12dbdc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,3 @@
-#
-# Main ffmpeg Makefile
-# (c) 2000-2004 Fabrice Bellard
-#
 include config.mak
 
 SRC_DIR = $(SRC_PATH_BARE)
@@ -71,14 +67,6 @@ ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
 %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
        $(CC) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
 
-SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
-ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
-version.h: $(SVN_ENTRIES)
-endif
-
-version.h:
-       $(SRC_PATH)/version.sh $(SRC_PATH)
-
 output_example$(EXESUF): output_example.o $(FF_DEP_LIBS)
        $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
@@ -160,8 +148,7 @@ uninstall-vhook:
        -rmdir "$(SHLIBDIR)/vhook/"
 
 clean::
-       rm -f gmon.out $(ALLPROGS) $(ALLPROGS_G) \
-          output_example$(EXESUF)
+       rm -f $(ALLPROGS) $(ALLPROGS_G) output_example$(EXESUF)
        rm -f doc/*.html doc/*.pod doc/*.1
        rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~
        rm -f $(addprefix tests/,$(addsuffix $(EXESUF),audiogen videogen rotozoom seek_test tiny_psnr))
@@ -169,7 +156,7 @@ clean::
        rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll
 
 distclean::
-       rm -f version.h config.* *.pc vhook/*.d
+       rm -f version.h config.* vhook/*.d
 
 # regression tests
 
@@ -275,6 +262,15 @@ LAVF_REG     = tests/data/lavf.regression
 ROTOZOOM_REG = tests/data/rotozoom.regression
 VSYNTH_REG   = tests/data/vsynth.regression
 
+ifeq ($(CONFIG_SWSCALE),yes)
+servertest codectest $(CODEC_TESTS) libavtest: swscale_error
+swscale_error:
+       @echo
+       @echo "This regression test is incompatible with --enable-swscale."
+       @echo
+       @exit 1
+endif
+
 codectest: $(VSYNTH_REG) $(ROTOZOOM_REG)
        diff -u -w $(FFMPEG_REFFILE)   $(VSYNTH_REG)
        diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG)
@@ -314,15 +310,6 @@ servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
        @echo
        $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
 
-ifeq ($(CONFIG_SWSCALE),yes)
-servertest codectest $(CODEC_TESTS) libavtest: swscale_error
-swscale_error:
-       @echo
-       @echo "This regression test is incompatible with --enable-swscale."
-       @echo
-       @exit 1
-endif
-
 tests/vsynth1/00.pgm: tests/videogen$(EXESUF)
        mkdir -p tests/vsynth1
        $(BUILD_ROOT)/$< 'tests/vsynth1/'