Michael Niedermayer f3d3e3fa4e Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'
* commit 'eb2b8bce39c93d16a02656238248c6cf697f447f':
  bfin: Use more sensible file names

Conflicts:
	libavcodec/bfin/pixels.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 02:12:45 +01:00
..
2014-03-13 08:15:53 -07:00