From f69f51b3b2820d803fe2279975660c11d334f70c Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 19 Aug 2012 21:35:30 +0200 Subject: [PATCH 1/4] configure: indentation cosmetics --- configure | 52 ++++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/configure b/configure index fec7b2543d..3bbdc0e038 100755 --- a/configure +++ b/configure @@ -55,7 +55,7 @@ if test "$E1" != 0 || test "$E2" = 0; then fi show_help(){ -cat <> $(SUBDIR)$(NAME).def; \ + echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \ + echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(SUBDIR)$(NAME).def; \ + echo EXPORTS >> $(SUBDIR)$(NAME).def; \ + emxexp -o $(OBJS) >> $(SUBDIR)$(NAME).def' SLIB_EXTRA_CMD='emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.a $(SUBDIR)$(NAME).def; \ - emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;' + emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;' SLIB_INSTALL_EXTRA_LIB='$(LIBPREF)$(NAME)_dll.a $(LIBPREF)$(NAME)_dll.lib' enable dos_paths ;; @@ -3025,7 +3025,7 @@ elif enabled sparc; then enabled vis && check_inline_asm vis '"pdist %f0, %f0, %f0"' -mcpu=ultrasparc && - add_cflags -mcpu=ultrasparc -mtune=ultrasparc + add_cflags -mcpu=ultrasparc -mtune=ultrasparc elif enabled x86; then @@ -3043,11 +3043,9 @@ elif enabled x86; then # if the base pointer is used to access it because the # base pointer is cleared in the inline assembly code. check_exec_crash <= 0.2 if you would like vdpau support." && - disable vdpau; } + check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" || + { echolog "Please upgrade to libvdpau >= 0.2 if you would like vdpau support." && disable vdpau; } fi enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel" @@ -3773,15 +3769,15 @@ test -n "$WARNINGS" && printf "\n$WARNINGS" # build pkg-config files pkgconfig_generate(){ -name=$1 -shortname=${name#lib}${build_suffix} -comment=$2 -version=$3 -libs=$4 -requires=$5 -enabled ${name#lib} || return 0 -mkdir -p $name -cat < $name/$name.pc + name=$1 + shortname=${name#lib}${build_suffix} + comment=$2 + version=$3 + libs=$4 + requires=$5 + enabled ${name#lib} || return 0 + mkdir -p $name + cat < $name/$name.pc prefix=$prefix exec_prefix=\${prefix} libdir=$libdir @@ -3797,7 +3793,7 @@ Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs) Libs.private: $(enabled shared && echo $libs) Cflags: -I\${includedir} EOF -cat < $name/$name-uninstalled.pc + cat < $name/$name-uninstalled.pc prefix= exec_prefix= libdir=\${pcfiledir} From 6121a3ef7f1572083c9bcdff0e7e024627472364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 11 Sep 2012 11:10:12 +0300 Subject: [PATCH 2/4] configure: Only disable aligned stack on MSVC on 32 bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 64 bit, the stack seems to be aligned enough for our needs. Signed-off-by: Martin Storsjö --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 3bbdc0e038..5afdab9efd 100755 --- a/configure +++ b/configure @@ -2330,7 +2330,6 @@ probe_cc(){ if [ $pfx = hostcc ]; then append _cflags -Dsnprintf=_snprintf fi - disable aligned_stack fi eval ${pfx}_type=\$_type @@ -3470,6 +3469,8 @@ elif enabled tms470; then add_cflags -pds=824 -pds=837 elif enabled pathscale; then add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF +elif enabled msvc; then + enabled x86_32 && disable aligned_stack fi enabled_any $THREADS_LIST && enable threads From 676ea8fae217af95d8bf29dada15c755b40d3d86 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 11 Sep 2012 17:07:37 +0200 Subject: [PATCH 3/4] avserver: Add missing #include for av_gettime() --- avserver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/avserver.c b/avserver.c index 9e6289914a..6d103bb0a9 100644 --- a/avserver.c +++ b/avserver.c @@ -43,6 +43,8 @@ #include "libavutil/random_seed.h" #include "libavutil/parseutils.h" #include "libavutil/opt.h" +#include "libavutil/time.h" + #include #include #include From 76fa7e09f18d5efa6b9c8ec5ef8d032a85e15865 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 11 Sep 2012 17:08:05 +0200 Subject: [PATCH 4/4] utvideoenc: Add missing AV_ prefix to codec ID --- libavcodec/utvideoenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 335e79b4a8..18bdec56a4 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -614,7 +614,7 @@ static int utvideo_encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVCodec ff_utvideo_encoder = { .name = "utvideo", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_UTVIDEO, + .id = AV_CODEC_ID_UTVIDEO, .priv_data_size = sizeof(UtvideoContext), .init = utvideo_encode_init, .encode2 = utvideo_encode_frame,