Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Feb 2013 10:56:23 +0000 (11:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Feb 2013 10:56:48 +0000 (11:56 +0100)
* qatar/master:
  avfilter: x86: consistent filenames for filter optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/x86/vf_gradfun.c
libavfilter/x86/vf_hqdn3d.asm
libavfilter/x86/vf_yadif.asm
libavfilter/x86/vf_yadif_init.c

Simple merge
Simple merge
Simple merge
Simple merge