Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:38:12 +0000 (12:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:40:32 +0000 (12:40 +0200)
commit1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260
tree23ab8275f66acfa5da4abc88e03737e9159b3f15
parent7372177a08c0fda59bc01abe44199b68953c3c70
parentd258531502b24cb653204fe4f003c8815755bdc4
Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4'

* commit 'd258531502b24cb653204fe4f003c8815755bdc4':
  swscale: Mark a bunch of tables only used within one file static

Conflicts:
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c