Michael Niedermayer a6ff8514a9 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>

2012-06-25 16:55:31 +02:00

38 KiB

Raw Blame History

View Raw