Merge commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 12:51:43 +0000 (13:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 12:51:47 +0000 (13:51 +0100)
commita8864615e6cc0bb202d9a269dbccbc7442232fe3
treef41aac64ec8b1f147c123e6658b4b4f2b6cedf96
parentffbe19fc84fe270410ee95a0501e5906c685e14d
parentb9c2408b19dc9408e9dc0ce4a099af529bbfba3b
Merge commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b'

* commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b':
  dsputil: Remove commented-out, unused function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.h