
* commit 'eb2b8bce39c93d16a02656238248c6cf697f447f': bfin: Use more sensible file names Conflicts: libavcodec/bfin/pixels.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'eb2b8bce39c93d16a02656238248c6cf697f447f': bfin: Use more sensible file names Conflicts: libavcodec/bfin/pixels.h Merged-by: Michael Niedermayer <michaelni@gmx.at>