# HG changeset patch # User reimar # Date 1306787025 0 # Node ID 8610374fd76c77948bbefcd3a4c2b2f1ba90eb1b # Parent bb77e30eabb9df03c92c7af1117a7f23f63660be Fix compilation with latest FFmpeg. diff -r bb77e30eabb9 -r 8610374fd76c configure --- a/configure Mon May 30 15:11:30 2011 +0000 +++ b/configure Mon May 30 20:23:45 2011 +0000 @@ -8138,8 +8138,7 @@ YASMFLAGS = $YASMFLAGS CONFIG_STATIC = yes -SRC_PATH = ../../ -BUILD_ROOT = .. +SRC_PATH = ../ LIBPREF = lib LIBSUF = .a LIBNAME = \$(LIBPREF)\$(NAME)\$(LIBSUF) @@ -8739,7 +8738,7 @@ done echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS" -cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm +cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm fi @@ -8748,6 +8747,10 @@ include ../../config.mak EOF +cat > ffmpeg/config.h << EOF +#include "../config.h" +EOF + ############################################################################# cat << EOF