Merge commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:31:39 +0000 (12:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:31:43 +0000 (12:31 +0200)
commit7372177a08c0fda59bc01abe44199b68953c3c70
treec527a048ea329d8bf7a82911f87c0abdba6faec2
parente1ec7990fe25081614cc7c366e1f821c8a2e7a77
parent060ce0c697e261ca2792a7df30dfd1bae6900a4f
Merge commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f'

* commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f':
  ivi_common: Make some tables only used within the file static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ivi_common.c