[FFmpeg-cvslog] Merge commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 12:31:39 2013 +0200| [7372177a08c0fda59bc01abe44199b68953c3c70] | committer: Michael Niedermayer

Merge commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f'

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

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

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