[FFmpeg-cvslog] Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 15:10:09 2013 +0200| [5ff1b588eb4e639f0b3cfeff2118aadb2b43584a] | committer: Michael Niedermayer

Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'

* commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19':
  swscale: ppc: Hide arch-specific initialization details

Conflicts:
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ff1b588eb4e639f0b3cfeff2118aadb2b43584a
---