ffmpeg/libavresample/x86
Michael Niedermayer 63a97d5674 Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'
* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa':
  cosmetics: Remove unnecessary extern keywords from function declarations

Conflicts:
	libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 11:20:41 +01:00
..
Makefile
audio_convert.asm
audio_convert_init.c
audio_mix.asm
audio_mix_init.c
dither.asm
dither_init.c Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01:00
util.asm