Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 14:24:50 +0000 (15:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 14:24:50 +0000 (15:24 +0100)
commitb4f64c58fc80585b9dc46f6ac6e385b2d55260a7
tree7ff1ebdb085a52c2dce75e6aefaedda443411eab
parent6967cf3c6c57dfdb831171f26f56fb1f521aed40
parentda5be235250a61d6994408b054e3e3acf2e0f90f
Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'

* commit 'da5be235250a61d6994408b054e3e3acf2e0f90f':
  dsputil: Move RV40-specific bits into rv40dsp

Conflicts:
libavcodec/dsputil.c
libavcodec/rv40dsp.c

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