Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Apr 2013 11:07:12 +0000 (13:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Apr 2013 11:07:20 +0000 (13:07 +0200)
commit2288c776897076a5f7f5cc772836592798160423
tree0f85650aaad1909389c64a0917ea5d5a6065f37e
parente4c0f258d38a961aff463c8474936771be7c561e
parent311a592dfcfc20b601a592472b36593351cf32c3
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Remove some duplicate function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/hpeldsp_init.c