From 7afdaa0d2b9672057ee97f1db5170b87bd84316d Mon Sep 17 00:00:00 2001 From: Ron Date: Sun, 9 Jun 2013 09:30:00 +0930 Subject: [PATCH 5/9] Switch to using config.h for configuration options The main motivation for this is it ensures the files will actually be rebuilt if the configuration options are changed. Add a description to the OD_X86ASM define, since autoheader barfs and dies when generating config.h.in without one. --- configure.ac | 3 ++- examples/dump_video.c | 4 ++++ examples/encoder_example.c | 4 ++++ examples/player_example.c | 4 ++++ src/adapt.c | 4 ++++ src/block_size.c | 4 ++++ src/block_size_dec.c | 4 ++++ src/block_size_enc.c | 4 ++++ src/decode.c | 4 ++++ src/encode.c | 4 ++++ src/entcode.c | 4 ++++ src/entdec.c | 4 ++++ src/entenc.c | 4 ++++ src/filter.c | 4 ++++ src/generic_code.c | 4 ++++ src/generic_decoder.c | 4 ++++ src/generic_encoder.c | 4 ++++ src/info.c | 4 ++++ src/infodec.c | 4 ++++ src/infoenc.c | 4 ++++ src/internal.c | 4 ++++ src/intra.c | 4 ++++ src/intradata.c | 4 ++++ src/laplace_tables.c | 4 ++++ src/logging.c | 4 ++++ src/mc.c | 4 ++++ src/mcenc.c | 4 ++++ src/newdct.c | 5 +++++ src/pvq.c | 4 ++++ src/pvq_decoder.c | 4 ++++ src/pvq_encoder.c | 4 ++++ src/state.c | 4 ++++ src/tests/check_initial.c | 4 ++++ src/tests/check_main.c | 4 ++++ src/tests/ectest.c | 4 ++++ src/tests/headerencode_test.c | 4 ++++ src/tests/logging_test.c | 4 ++++ src/tests/test_coef_coder.c | 4 ++++ src/tests/test_divu_small.c | 4 ++++ src/tf.c | 4 ++++ src/x86/cpu.c | 4 ++++ src/x86/sse2mc.c | 4 ++++ src/x86/x86state.c | 4 ++++ tools/block_size_analysis.c | 3 +++ tools/cholesky.c | 4 ++++ tools/data_compactor.c | 7 +++++++ tools/divu_const.c | 4 ++++ tools/dump_psnrhvs.c | 4 ++++ tools/ec_test.c | 4 ++++ tools/gen_cdf.c | 4 ++++ tools/gen_laplace_tables.c | 7 +++++++ tools/image.c | 4 ++++ tools/image_tools.c | 4 ++++ tools/init_intra_maps.c | 4 ++++ tools/init_intra_xform.c | 4 ++++ tools/int_search.c | 4 ++++ tools/intra_fit_tools.c | 4 ++++ tools/intra_pred.c | 4 ++++ tools/intra_stats.c | 4 ++++ tools/intra_trace.c | 4 ++++ tools/kiss99.c | 4 ++++ tools/od_covmat.c | 4 ++++ tools/od_filter.c | 4 ++++ tools/od_intra.c | 4 ++++ tools/od_intra_data.c | 4 ++++ tools/plot_intra_maps.c | 4 ++++ tools/png2y4m.c | 5 +++++ tools/stats_tools.c | 4 ++++ tools/svd.c | 4 ++++ tools/trans.c | 4 ++++ tools/trans2d.c | 4 ++++ tools/trans_data.c | 4 ++++ tools/trans_gain.c | 4 ++++ tools/trans_tools.c | 4 ++++ tools/vidinput.c | 4 ++++ tools/y4m2png.c | 4 ++++ 76 files changed, 309 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 53b007e..5ff27a4 100644 --- a/configure.ac +++ b/configure.ac @@ -127,7 +127,7 @@ esac AM_CONDITIONAL([ENABLE_X86ASM], [test "$enable_asm" = "yes" -a "$cpu_x86" = "true"]) AS_IF([test "$enable_asm" = "yes" -a "$cpu_x86" = "true"], [ - AC_DEFINE([OD_X86ASM], [1]) + AC_DEFINE([OD_X86ASM], [1], [Enable asm optimisations]) ]) AM_CONDITIONAL(ENABLE_DOCS, [test $enable_doc = yes]) @@ -149,6 +149,7 @@ AC_CONFIG_FILES([ daala-uninstalled.pc doc/Doxyfile ]) +AC_CONFIG_HEADERS([config.h]) AC_OUTPUT AC_MSG_NOTICE([ diff --git a/examples/dump_video.c b/examples/dump_video.c index c29070e..82e0011 100644 --- a/examples/dump_video.c +++ b/examples/dump_video.c @@ -24,6 +24,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ /*This code was cargo-culted from libtheora's dump_video.c.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #if !defined(_REENTRANT) #define _REENTRANT #endif diff --git a/examples/encoder_example.c b/examples/encoder_example.c index f256129..608fef3 100644 --- a/examples/encoder_example.c +++ b/examples/encoder_example.c @@ -23,6 +23,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/examples/player_example.c b/examples/player_example.c index ee96e52..fdfdc6b 100644 --- a/examples/player_example.c +++ b/examples/player_example.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include diff --git a/src/adapt.c b/src/adapt.c index 3d7cfe7..96d3b5e 100644 --- a/src/adapt.c +++ b/src/adapt.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "adapt.h" /* Once per frame */ diff --git a/src/block_size.c b/src/block_size.c index 14d7345..3d4c414 100644 --- a/src/block_size.c +++ b/src/block_size.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "block_size.h" #include #include "internal.h" diff --git a/src/block_size_dec.c b/src/block_size_dec.c index 74c76c3..74ccd64 100644 --- a/src/block_size_dec.c +++ b/src/block_size_dec.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "block_size.h" #include "block_size_dec.h" diff --git a/src/block_size_enc.c b/src/block_size_enc.c index 016cc56..6157524 100644 --- a/src/block_size_enc.c +++ b/src/block_size_enc.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "block_size.h" #include "block_size_enc.h" #include diff --git a/src/decode.c b/src/decode.c index ac9a193..657e3b0 100644 --- a/src/decode.c +++ b/src/decode.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/src/encode.c b/src/encode.c index 5a4191b..2f67029 100644 --- a/src/encode.c +++ b/src/encode.c @@ -23,6 +23,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/src/entcode.c b/src/entcode.c index 016bb5b..2ce707b 100644 --- a/src/entcode.c +++ b/src/entcode.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "entcode.h" /*CDFs for uniform probability distributions of small sizes (2 through 16, diff --git a/src/entdec.c b/src/entdec.c index 88ab2e1..76aee85 100644 --- a/src/entdec.c +++ b/src/entdec.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "entdec.h" /*A range decoder. diff --git a/src/entenc.c b/src/entenc.c index 36c1bad..8a4ec44 100644 --- a/src/entenc.c +++ b/src/entenc.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "entenc.h" diff --git a/src/filter.c b/src/filter.c index ad05a7a..3681a74 100644 --- a/src/filter.c +++ b/src/filter.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "filter.h" #include "block_size.h" diff --git a/src/generic_code.c b/src/generic_code.c index 5deaa42..4b5e00f 100644 --- a/src/generic_code.c +++ b/src/generic_code.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "generic_code.h" /** Takes the base-2 log of E(x) diff --git a/src/generic_decoder.c b/src/generic_decoder.c index bf58a6c..7337874 100644 --- a/src/generic_decoder.c +++ b/src/generic_decoder.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include "generic_code.h" diff --git a/src/generic_encoder.c b/src/generic_encoder.c index 691081e..90fe34b 100644 --- a/src/generic_encoder.c +++ b/src/generic_encoder.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include "generic_code.h" diff --git a/src/info.c b/src/info.c index 8e46d32..7dca089 100644 --- a/src/info.c +++ b/src/info.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "internal.h" diff --git a/src/infodec.c b/src/infodec.c index 6ff5770..6576ece 100644 --- a/src/infodec.c +++ b/src/infodec.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/src/infoenc.c b/src/infoenc.c index d0baaf0..4979c0e 100644 --- a/src/infoenc.c +++ b/src/infoenc.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include "encint.h" diff --git a/src/internal.c b/src/internal.c index 1964289..2653090 100644 --- a/src/internal.c +++ b/src/internal.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/src/intra.c b/src/intra.c index 0633def..90e4a63 100644 --- a/src/intra.c +++ b/src/intra.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "filter.h" diff --git a/src/intradata.c b/src/intradata.c index 6b13314..970e911 100644 --- a/src/intradata.c +++ b/src/intradata.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "intra.h" const int OD_PRED_OFFSETS_4x4[OD_INTRA_NMODES] = { diff --git a/src/laplace_tables.c b/src/laplace_tables.c index 813ee8e..2d24095 100644 --- a/src/laplace_tables.c +++ b/src/laplace_tables.c @@ -1,5 +1,9 @@ /* This file is auto-generated using "gen_laplace_tables 128 7" */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "pvq_code.h" const ogg_uint16_t exp_cdf_table[128][16] = { diff --git a/src/logging.c b/src/logging.c index 84cb199..2412fd6 100644 --- a/src/logging.c +++ b/src/logging.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "logging.h" #include diff --git a/src/mc.c b/src/mc.c index c9139f5..73cf55e 100644 --- a/src/mc.c +++ b/src/mc.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "logging.h" diff --git a/src/mcenc.c b/src/mcenc.c index fb50b20..aa4aec8 100644 --- a/src/mcenc.c +++ b/src/mcenc.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/src/newdct.c b/src/newdct.c index 2b1d5a2..2cb58f7 100644 --- a/src/newdct.c +++ b/src/newdct.c @@ -21,6 +21,11 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "dct.h" /*Adjustments for the quantization step in Q15, a factor of 2^(1/4) per diff --git a/src/pvq.c b/src/pvq.c index c381da2..2f6ef86 100644 --- a/src/pvq.c +++ b/src/pvq.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "pvq.h" #include #include diff --git a/src/pvq_decoder.c b/src/pvq_decoder.c index 06158a5..875a25f 100644 --- a/src/pvq_decoder.c +++ b/src/pvq_decoder.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "internal.h" diff --git a/src/pvq_encoder.c b/src/pvq_encoder.c index 5ceb689..aac9944 100644 --- a/src/pvq_encoder.c +++ b/src/pvq_encoder.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "internal.h" diff --git a/src/state.c b/src/state.c index 7f65f04..b10c05a 100644 --- a/src/state.c +++ b/src/state.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/src/tests/check_initial.c b/src/tests/check_initial.c index 9bd2d46..3166f47 100644 --- a/src/tests/check_initial.c +++ b/src/tests/check_initial.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include diff --git a/src/tests/check_main.c b/src/tests/check_main.c index b323408..7422fe5 100644 --- a/src/tests/check_main.c +++ b/src/tests/check_main.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include diff --git a/src/tests/ectest.c b/src/tests/ectest.c index 55086cc..0566fea 100644 --- a/src/tests/ectest.c +++ b/src/tests/ectest.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/src/tests/headerencode_test.c b/src/tests/headerencode_test.c index 73d2630..a3cf33d 100644 --- a/src/tests/headerencode_test.c +++ b/src/tests/headerencode_test.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "../encint.h" #include diff --git a/src/tests/logging_test.c b/src/tests/logging_test.c index 10e7652..c8069ac 100644 --- a/src/tests/logging_test.c +++ b/src/tests/logging_test.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "../logging.h" #include diff --git a/src/tests/test_coef_coder.c b/src/tests/test_coef_coder.c index 41ea73e..3100448 100644 --- a/src/tests/test_coef_coder.c +++ b/src/tests/test_coef_coder.c @@ -18,6 +18,10 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "../generic_code.c" #include "../pvq_encoder.c" #include "../generic_encoder.c" diff --git a/src/tests/test_divu_small.c b/src/tests/test_divu_small.c index 7ad769d..419737f 100644 --- a/src/tests/test_divu_small.c +++ b/src/tests/test_divu_small.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/src/tf.c b/src/tf.c index 9749dd1..683cd87 100644 --- a/src/tf.c +++ b/src/tf.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "tf.h" #include "block_size.h" #if defined(OD_VALGRIND) diff --git a/src/x86/cpu.c b/src/x86/cpu.c index 676a7cc..655c67c 100644 --- a/src/x86/cpu.c +++ b/src/x86/cpu.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "cpu.h" #include "x86int.h" #if defined(OD_X86ASM) diff --git a/src/x86/sse2mc.c b/src/x86/sse2mc.c index e5998a2..9e602cc 100644 --- a/src/x86/sse2mc.c +++ b/src/x86/sse2mc.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/src/x86/x86state.c b/src/x86/x86state.c index 073def4..3ec7210 100644 --- a/src/x86/x86state.c +++ b/src/x86/x86state.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "x86int.h" #include "cpu.h" #if defined(OD_X86ASM) diff --git a/tools/block_size_analysis.c b/tools/block_size_analysis.c index ca3ee51..bd1c500 100644 --- a/tools/block_size_analysis.c +++ b/tools/block_size_analysis.c @@ -22,6 +22,9 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include diff --git a/tools/cholesky.c b/tools/cholesky.c index e2b9525..c1334fe 100644 --- a/tools/cholesky.c +++ b/tools/cholesky.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/tools/data_compactor.c b/tools/data_compactor.c index 959f45e..23faa7b 100644 --- a/tools/data_compactor.c +++ b/tools/data_compactor.c @@ -26,6 +26,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ or not. It uses the original non-sparse versions of these to generate smaller ones.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #if defined(TRAIN) @@ -155,6 +159,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ #endif int main() { + printf("#ifdef HAVE_CONFIG_H\n"); + printf("#include \"config.h\"\n"); + printf("#endif\n\n"); #if defined(TRAIN) printf("#include \"od_defs.h\"\n"); printf("#include \"od_intra.h\"\n\n"); diff --git a/tools/divu_const.c b/tools/divu_const.c index 2599307..bb45a55 100644 --- a/tools/divu_const.c +++ b/tools/divu_const.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "../src/odintrin.h" diff --git a/tools/dump_psnrhvs.c b/tools/dump_psnrhvs.c index 791c961..4a90fa1 100644 --- a/tools/dump_psnrhvs.c +++ b/tools/dump_psnrhvs.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "vidinput.h" #include #include diff --git a/tools/ec_test.c b/tools/ec_test.c index 40f5374..7ae0447 100644 --- a/tools/ec_test.c +++ b/tools/ec_test.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/tools/gen_cdf.c b/tools/gen_cdf.c index c5bd0cd..23ddda9 100644 --- a/tools/gen_cdf.c +++ b/tools/gen_cdf.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/tools/gen_laplace_tables.c b/tools/gen_laplace_tables.c index 2a34f92..278c49c 100644 --- a/tools/gen_laplace_tables.c +++ b/tools/gen_laplace_tables.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include @@ -48,6 +52,9 @@ int main(int argc, char **argv) shift=atoi(argv[2]); printf("/* This file is auto-generated using \"gen_laplace_tables %d %d\" */\n\n", N, shift); + printf("#ifdef HAVE_CONFIG_H\n"); + printf("#include \"config.h\"\n"); + printf("#endif\n\n"); printf("#include \"pvq_code.h\"\n\n"); printf("const ogg_uint16_t exp_cdf_table[%d][16] = {\n", N); printf(" {"); diff --git a/tools/image.c b/tools/image.c index 453f34d..f98dc69 100644 --- a/tools/image.c +++ b/tools/image.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "image.h" #include #include diff --git a/tools/image_tools.c b/tools/image_tools.c index bd5c2e1..2e553f0 100644 --- a/tools/image_tools.c +++ b/tools/image_tools.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include "od_defs.h" #include "od_filter.h" diff --git a/tools/init_intra_maps.c b/tools/init_intra_maps.c index 2ffa6c4..07f56cc 100644 --- a/tools/init_intra_maps.c +++ b/tools/init_intra_maps.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/tools/init_intra_xform.c b/tools/init_intra_xform.c index a4c12f3..27bed30 100644 --- a/tools/init_intra_xform.c +++ b/tools/init_intra_xform.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/tools/int_search.c b/tools/int_search.c index 18537c8..e823a2b 100644 --- a/tools/int_search.c +++ b/tools/int_search.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "int_search.h" diff --git a/tools/intra_fit_tools.c b/tools/intra_fit_tools.c index a0dbfe7..0b8cffa 100644 --- a/tools/intra_fit_tools.c +++ b/tools/intra_fit_tools.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "intra_fit_tools.h" diff --git a/tools/intra_pred.c b/tools/intra_pred.c index dc68d2b..0099945 100644 --- a/tools/intra_pred.c +++ b/tools/intra_pred.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/tools/intra_stats.c b/tools/intra_stats.c index 3ecefea..cf42939 100644 --- a/tools/intra_stats.c +++ b/tools/intra_stats.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "od_defs.h" diff --git a/tools/intra_trace.c b/tools/intra_trace.c index fcf1897..f929c30 100644 --- a/tools/intra_trace.c +++ b/tools/intra_trace.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "od_defs.h" diff --git a/tools/kiss99.c b/tools/kiss99.c index 6dafc7b..6b840d0 100644 --- a/tools/kiss99.c +++ b/tools/kiss99.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "kiss99.h" diff --git a/tools/od_covmat.c b/tools/od_covmat.c index 669ac7c..c0fab61 100644 --- a/tools/od_covmat.c +++ b/tools/od_covmat.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "od_defs.h" diff --git a/tools/od_filter.c b/tools/od_filter.c index e0921c9..8b14d3f 100644 --- a/tools/od_filter.c +++ b/tools/od_filter.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "od_defs.h" #include "od_filter.h" diff --git a/tools/od_intra.c b/tools/od_intra.c index 0d86070..d302bd1 100644 --- a/tools/od_intra.c +++ b/tools/od_intra.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "od_intra.h" static void ne_intra_pred4x4_mult(double *_pred,int _pred_stride, diff --git a/tools/od_intra_data.c b/tools/od_intra_data.c index bbc1c31..e1add5e 100644 --- a/tools/od_intra_data.c +++ b/tools/od_intra_data.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "od_defs.h" #include "od_intra.h" diff --git a/tools/plot_intra_maps.c b/tools/plot_intra_maps.c index 3ce613d..d4cf0a6 100644 --- a/tools/plot_intra_maps.c +++ b/tools/plot_intra_maps.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/tools/png2y4m.c b/tools/png2y4m.c index c8d4213..eb12378 100644 --- a/tools/png2y4m.c +++ b/tools/png2y4m.c @@ -26,6 +26,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ The Theora source code is copyright (C) 2002-2009 by the Xiph.Org Foundation and contributors http://www.xiph.org/ Based on code from Vegard Nossum.*/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #if !defined(_LARGEFILE_SOURCE) # define _LARGEFILE_SOURCE #endif diff --git a/tools/stats_tools.c b/tools/stats_tools.c index 2de227b..77a4d07 100644 --- a/tools/stats_tools.c +++ b/tools/stats_tools.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "stats_tools.h" diff --git a/tools/svd.c b/tools/svd.c index 08f1ae4..ba63575 100644 --- a/tools/svd.c +++ b/tools/svd.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/tools/trans.c b/tools/trans.c index 6fadafa..764fe10 100644 --- a/tools/trans.c +++ b/tools/trans.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include "od_defs.h" #include "od_filter.h" diff --git a/tools/trans2d.c b/tools/trans2d.c index 2ad0d85..12b500b 100644 --- a/tools/trans2d.c +++ b/tools/trans2d.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include "od_defs.h" #include "od_filter.h" diff --git a/tools/trans_data.c b/tools/trans_data.c index 5d6c7d8..249d313 100644 --- a/tools/trans_data.c +++ b/tools/trans_data.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "trans_tools.h" const double SUBSET1_1D_4x8[2*4]={ diff --git a/tools/trans_gain.c b/tools/trans_gain.c index 6dfe83a..8aa4c61 100644 --- a/tools/trans_gain.c +++ b/tools/trans_gain.c @@ -78,6 +78,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ LappedDCT */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include "od_defs.h" #include "od_filter.h" diff --git a/tools/trans_tools.c b/tools/trans_tools.c index 04736bc..5bef33c 100644 --- a/tools/trans_tools.c +++ b/tools/trans_tools.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include "od_defs.h" #include "od_filter.h" diff --git a/tools/vidinput.c b/tools/vidinput.c index 702a0c4..366ae6d 100644 --- a/tools/vidinput.c +++ b/tools/vidinput.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "vidinput.h" #include #include diff --git a/tools/y4m2png.c b/tools/y4m2png.c index 460ce3b..42131bb 100644 --- a/tools/y4m2png.c +++ b/tools/y4m2png.c @@ -22,6 +22,10 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #if !defined(_LARGEFILE_SOURCE) # define _LARGEFILE_SOURCE #endif -- 1.7.2.5