[FFmpeg-cvslog] Merge commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 21 12:21:01 2013 +0200| [16466d92b9f795579d4020b1c7cb3ad7750cc182] | committer: Michael Niedermayer

Merge commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b'

* commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b':
  h264data: Move some tables to the only place they are used

Conflicts:
	libavcodec/h264data.h

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

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