mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: utvideoenc: Add missing AV_ prefix to codec ID avserver: Add missing #include for av_gettime() configure: Only disable aligned stack on MSVC on 32 bit configure: indentation cosmetics Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
commit
ac0f1ae64b
55
configure
vendored
55
configure
vendored
@ -55,7 +55,7 @@ if test "$E1" != 0 || test "$E2" = 0; then
|
||||
fi
|
||||
|
||||
show_help(){
|
||||
cat <<EOF
|
||||
cat <<EOF
|
||||
Usage: configure [options]
|
||||
Options: [defaults in brackets after descriptions]
|
||||
|
||||
@ -367,7 +367,7 @@ Rerun configure with logging enabled (do not use --disable-logging), and
|
||||
include the log this produces with your report.
|
||||
EOF
|
||||
else
|
||||
cat <<EOF
|
||||
cat <<EOF
|
||||
Include the log file "$logfile" produced by configure as this will help
|
||||
solving the problem.
|
||||
EOF
|
||||
@ -2605,7 +2605,6 @@ probe_cc(){
|
||||
if [ $pfx = hostcc ]; then
|
||||
append _cflags -Dsnprintf=_snprintf
|
||||
fi
|
||||
disable aligned_stack
|
||||
fi
|
||||
|
||||
eval ${pfx}_type=\$_type
|
||||
@ -3114,13 +3113,13 @@ case $target_os in
|
||||
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)'
|
||||
SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE > $(SUBDIR)$(NAME).def; \
|
||||
echo PROTMODE >> $(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'
|
||||
echo PROTMODE >> $(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
|
||||
enable_weak os2threads
|
||||
@ -3350,7 +3349,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
|
||||
|
||||
@ -3368,11 +3367,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 <<EOF && enable ebp_available
|
||||
volatile int i=0;
|
||||
__asm__ volatile (
|
||||
"xorl %%ebp, %%ebp"
|
||||
::: "%ebp");
|
||||
return i;
|
||||
volatile int i=0;
|
||||
__asm__ volatile ("xorl %%ebp, %%ebp" ::: "%ebp");
|
||||
return i;
|
||||
EOF
|
||||
|
||||
# check whether EBX is available on x86
|
||||
@ -3750,10 +3747,8 @@ if ! disabled vaapi; then
|
||||
fi
|
||||
|
||||
if ! disabled vdpau && enabled vdpau_vdpau_h; then
|
||||
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; }
|
||||
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"
|
||||
@ -3876,6 +3871,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
|
||||
@ -4279,15 +4276,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 <<EOF > $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 <<EOF > $name/$name.pc
|
||||
prefix=$prefix
|
||||
exec_prefix=\${prefix}
|
||||
libdir=$libdir
|
||||
@ -4307,7 +4304,7 @@ EOF
|
||||
mkdir -p doc/examples/pc-uninstalled
|
||||
includedir=${source_path}
|
||||
[ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
|
||||
cat <<EOF > doc/examples/pc-uninstalled/$name.pc
|
||||
cat <<EOF > doc/examples/pc-uninstalled/$name.pc
|
||||
prefix=
|
||||
exec_prefix=
|
||||
libdir=\${pcfiledir}/../../../$name
|
||||
|
||||
@ -48,6 +48,8 @@
|
||||
#include "libavutil/random_seed.h"
|
||||
#include "libavutil/parseutils.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/time.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
@ -610,7 +610,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,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user