diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-25 16:55:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-25 16:55:31 +0200 |
| commit | a6ff8514a9bdc93739a73d28913c6b457baff32d (patch) | |
| tree | ed4f3c885586b33b7d8229e606acc80cd8c8ca50 /libavcodec/x86/h264_i386.h | |
| parent | fec512a52cdd1bab84958474cc160fdb7be81dec (diff) | |
| parent | dc5385806339f90b4eb074d9002205ebb4010cc2 (diff) | |
| download | ffmpeg-a6ff8514a9bdc93739a73d28913c6b457baff32d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wtv: Check the return value from gmtime
x86: fft: convert sse inline asm to yasm
x86: place some inline asm under #if HAVE_INLINE_ASM
Conflicts:
libavcodec/x86/fft_sse.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_i386.h')
| -rw-r--r-- | libavcodec/x86/h264_i386.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h index da85f3c088..b059cf9423 100644 --- a/libavcodec/x86/h264_i386.h +++ b/libavcodec/x86/h264_i386.h @@ -34,6 +34,8 @@ #include "libavcodec/cabac.h" #include "cabac.h" +#if HAVE_INLINE_ASM + //FIXME use some macros to avoid duplicating get_cabac (cannot be done yet //as that would make optimization work hard) #if HAVE_7REGS @@ -187,4 +189,5 @@ static int decode_significance_8x8_x86(CABACContext *c, } #endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ +#endif /* HAVE_INLINE_ASM */ #endif /* AVCODEC_X86_H264_I386_H */ |