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)
commit0b6f34cc9f281725fe7aeb011add88e896a2ec81
tree8bcb82cff3b7f61ab61cdd9f1fc56431382a23b9
parent103a2c2b1757ac89c48cb76e5f8b5272d0329521
parente66240f22e240b0f0d970d1b138db80ceb517097
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter: x86: consistent filenames for filter optimizations

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