1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavutil
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
..
2012-04-20 09:43:11 -04:00
2012-04-20 09:43:11 -04:00
2012-01-22 23:06:04 +01:00
2012-04-01 11:01:08 +02:00
2012-05-15 18:08:32 +02:00
2012-05-15 18:08:32 +02:00
2012-06-06 20:01:08 +02:00
2012-06-09 02:51:02 +02:00
2012-06-07 22:13:59 +02:00
2012-06-08 10:42:27 +00:00