* commit '167e004e':
  h264: drop any pretense of support for data partitioning

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