virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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 2012-09-12 11:46:47 +02:00
commit ac0f1ae64b
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -2605,7 +2605,6 @@ probe_cc(){
if [ $pfx = hostcc ]; then if [ $pfx = hostcc ]; then
append _cflags -Dsnprintf=_snprintf append _cflags -Dsnprintf=_snprintf
fi fi
disable aligned_stack
fi fi
eval ${pfx}_type=\$_type eval ${pfx}_type=\$_type
@ -3369,9 +3368,7 @@ elif enabled x86; then
# base pointer is cleared in the inline assembly code. # base pointer is cleared in the inline assembly code.
check_exec_crash <<EOF && enable ebp_available check_exec_crash <<EOF && enable ebp_available
volatile int i=0; volatile int i=0;
__asm__ volatile ( __asm__ volatile ("xorl %%ebp, %%ebp" ::: "%ebp");
"xorl %%ebp, %%ebp"
::: "%ebp");
return i; return i;
EOF EOF
@ -3750,10 +3747,8 @@ if ! disabled vaapi; then
fi fi
if ! disabled vdpau && enabled vdpau_vdpau_h; then if ! disabled vdpau && enabled vdpau_vdpau_h; then
check_cpp_condition \ check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" ||
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; }
{ echolog "Please upgrade to libvdpau >= 0.2 if you would like vdpau support." &&
disable vdpau; }
fi fi
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel" enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
@ -3876,6 +3871,8 @@ elif enabled tms470; then
add_cflags -pds=824 -pds=837 add_cflags -pds=824 -pds=837
elif enabled pathscale; then elif enabled pathscale; then
add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF
elif enabled msvc; then
enabled x86_32 && disable aligned_stack
fi fi
enabled_any $THREADS_LIST && enable threads enabled_any $THREADS_LIST && enable threads

2
ffserver.c
View File

@ -48,6 +48,8 @@
#include "libavutil/random_seed.h" #include "libavutil/random_seed.h"
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/time.h"
#include <stdarg.h> #include <stdarg.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>

2
libavcodec/utvideoenc.c
View File

@ -610,7 +610,7 @@ static int utvideo_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
AVCodec ff_utvideo_encoder = { AVCodec ff_utvideo_encoder = {
.name = "utvideo", .name = "utvideo",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_UTVIDEO, .id = AV_CODEC_ID_UTVIDEO,
.priv_data_size = sizeof(UtvideoContext), .priv_data_size = sizeof(UtvideoContext),
.init = utvideo_encode_init, .init = utvideo_encode_init,
.encode2 = utvideo_encode_frame, .encode2 = utvideo_encode_frame,