Michael Niedermayer ebb21887b8 Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8' ...

* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
  x86: Drop some unnecessary YASM ifdefs

Conflicts:
	libavfilter/x86/vf_yadif_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-04-05 19:16:39 +02:00

..

audio_convert_init.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

audio_convert.asm

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

audio_mix_init.c

Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'

2014-04-05 19:16:39 +02:00

audio_mix.asm

Merge commit '206895708ea2b464755d340e44501daf9a07c310'

2013-10-14 15:54:23 +02:00

dither_init.c

Merge remote-tracking branch 'qatar/master'

2013-07-18 09:53:47 +02:00

dither.asm

Merge remote-tracking branch 'qatar/master'

2013-01-09 12:30:14 +01:00

Makefile

x86/arm: Add clobber tests to libavresample

2014-01-13 14:13:27 +02:00

util.asm

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

w64xmmtest.c

Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'

2014-01-13 14:36:55 +01:00