[SCM] libav/experimental: Generate mpegaudio tables only when CONFIG_HARDCODED_TABLES is set

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:53:48 UTC 2013


The following commit has been merged in the experimental branch:
commit df4fe41df48efd5f494a794f52dde2bc69bf5cc0
Author: Måns Rullgård <mans at mansr.com>
Date:   Wed Oct 28 19:49:16 2009 +0000

    Generate mpegaudio tables only when CONFIG_HARDCODED_TABLES is set
    
    Having mpegaudiodec.o unconditionally depend on mpegaudio_tables.h
    forces the latter to be generated even when it will not be used.
    
    Originally committed as revision 20405 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index e36305f..40c1681 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -710,6 +710,9 @@ endif
 $(SUBDIR)%_tablegen$(HOSTEXESUF): $(SUBDIR)%_tablegen.c $(SUBDIR)tableprint.c
 	$(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ $(HOSTLIBS)
 
-$(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h
 $(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen$(HOSTEXESUF)
 	./$< > $@
+
+ifdef CONFIG_HARDCODED_TABLES
+$(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h
+endif

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list