Merge commit '619e0da19119bcd683f135fe9a164f37c0ca70d1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 13:55:29 +0000 (15:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 13:55:29 +0000 (15:55 +0200)
commitf6dcd844ee65b187b7b352e3740c43724175b3e1
tree58447edbac4f928569f73e943cfaebabd0bf3130
parentc3624cfe7638e41891cebf08c3381036adc8a9cd
parent619e0da19119bcd683f135fe9a164f37c0ca70d1
Merge commit '619e0da19119bcd683f135fe9a164f37c0ca70d1'

* commit '619e0da19119bcd683f135fe9a164f37c0ca70d1':
  dsputil: Remove unused 32-bit functions

Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil_template.c

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