Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Jun 2012 14:55:31 +0000 (16:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Jun 2012 14:55:31 +0000 (16:55 +0200)
commita6ff8514a9bdc93739a73d28913c6b457baff32d
treeed4f3c885586b33b7d8229e606acc80cd8c8ca50
parentfec512a52cdd1bab84958474cc160fdb7be81dec
parentdc5385806339f90b4eb074d9002205ebb4010cc2
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>
14 files changed:
libavcodec/x86/Makefile
libavcodec/x86/cabac.h
libavcodec/x86/cavsdsp_mmx.c
libavcodec/x86/dnxhd_mmx.c
libavcodec/x86/fft_mmx.asm
libavcodec/x86/h264_i386.h
libavcodec/x86/lpc_mmx.c
libavcodec/x86/mathops.h
libavcodec/x86/snowdsp_mmx.c
libavcodec/x86/vc1dsp_mmx.c
libavformat/wtvdec.c
libavutil/internal.h
libavutil/x86/bswap.h
libavutil/x86/intmath.h