Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 09:20:20 +0000 (10:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 09:20:20 +0000 (10:20 +0100)
commitffe33500983983946048def3a6047920d97d957b
treeaf118d7e0ca3491233ddcf201b8a8beee2fb8f4d
parentec5e02d49573975ee4bc73be173a2fad76d808ff
parentee80cf741a44115758e62399b7bde08d33161151
Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'

* commit 'ee80cf741a44115758e62399b7bde08d33161151':
  avfilter: x86: K&R formatting cosmetics

Conflicts:
libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/x86/vf_gradfun_init.c
libavfilter/x86/vf_hqdn3d_init.c