Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:53:24 +0000 (12:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:56:48 +0000 (12:56 +0200)
commitc14fc4585c2b8636ae0609582456c78097ea82c9
treeccfd862de19247e32e5a7b40bf9769a41c26cb84
parent1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260
parentaa2ba8c99e5708884a56aea9c1d96e014866f8a3
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@gmx.at>
libswscale/output.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.c
libswscale/yuv2rgb.c