Commit a6ff8514 authored 12 years ago by Michael Niedermayer

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>

parents fec512a5 dc538580

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 184 additions and 124 deletions

Please register or to comment