[FFmpeg-cvslog] Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 11:20:41 2013 +0100| [63a97d56748a5deaaf5b9c26ac49f5086a8cceeb] | committer: Michael Niedermayer

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa':
  cosmetics: Remove unnecessary extern keywords from function declarations

Conflicts:
	libswscale/x86/swscale.c

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

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