diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 22:14:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 22:22:37 +0200 |
| commit | 7ae473e8a04f686bbeda75c40167c2df4211e662 (patch) | |
| tree | 073415316c09d2c86fcd41640f0bab7fddc8c4ed /configure | |
| parent | a80ce390df38b30f70012c9ce059129516664805 (diff) | |
| parent | cf22705e87b6f5015b5cbbf60b6ce9b818eb1900 (diff) | |
| download | ffmpeg-7ae473e8a04f686bbeda75c40167c2df4211e662.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
nuv: K&R formatting cosmetics
build: generalise rules and variable settings for av* programs
nuv: check RTjpeg header for validity
Revert "nuv: check per-frame header for validity."
imc: remove unused field IMCContext.one_div_log2
imc: fix size of a memset()
imc: remove empty if() block
fate: simplify variable setting filter.mak
lavf: Declare an AVRational struct without a struct literal
Conflicts:
Makefile
configure
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -3926,7 +3926,7 @@ CXX_O=$CXX_O LD_O=$LD_O DLLTOOL=$dlltool LDFLAGS=$LDFLAGS -FFSERVERLDFLAGS=$FFSERVERLDFLAGS +LDFLAGS-ffserver=$FFSERVERLDFLAGS SHFLAGS=$SHFLAGS YASMFLAGS=$YASMFLAGS BUILDSUF=$build_suffix @@ -3960,8 +3960,8 @@ HOSTCC_C=$HOSTCC_C HOSTCC_O=$HOSTCC_O TARGET_EXEC=$target_exec TARGET_PATH=$target_path -SDL_LIBS=$sdl_libs -SDL_CFLAGS=$sdl_cflags +LIBS-ffplay=$sdl_libs +CFLAGS-ffplay=$sdl_cflags LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD EXTRALIBS=$extralibs INSTALL=$install |