1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
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
..
audio_convert_init.c cosmetics: Remove unnecessary extern keywords from function declarations 2013-03-27 14:21:45 +01:00
audio_convert.asm
audio_mix_init.c cosmetics: Remove unnecessary extern keywords from function declarations 2013-03-27 14:21:45 +01:00
audio_mix.asm
dither_init.c Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01:00
dither.asm Merge remote-tracking branch 'qatar/master' 2013-01-09 12:30:14 +01:00
Makefile
util.asm