[FFmpeg-cvslog] Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 12:53:24 2013 +0200| [c14fc4585c2b8636ae0609582456c78097ea82c9] | committer: Michael Niedermayer

Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'

* commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3':
  swscale: Move extern declarations for tables to swscale_internal.h

Conflicts:
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/yuv2rgb.c

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

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