Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 01:12:45 +0000 (02:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 01:12:45 +0000 (02:12 +0100)
commitf3d3e3fa4e1033e27977b7fdcab4a22fba57fe98
treedd1f7b142c1ec164edc456ee0da025f694be50f7
parentbe60e20498c7d9fb253aaca689be09585df137ee
parenteb2b8bce39c93d16a02656238248c6cf697f447f
Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'

* commit 'eb2b8bce39c93d16a02656238248c6cf697f447f':
  bfin: Use more sensible file names

Conflicts:
libavcodec/bfin/pixels.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/bfin/dsputil.S
libavcodec/bfin/dsputil_init.c
libavcodec/bfin/hpeldsp_init.c
libavcodec/bfin/pixels.S
libavcodec/bfin/pixels.h
libavcodec/bfin/vp3dsp.S
libavcodec/bfin/vp3dsp_init.c