* commit 'f0259a58':
  h264: check buffer size before accessing it

Conflicts:
	libavcodec/h264.c

See: ea0ac11eMerged-by: Michael Niedermayer <michaelni@gmx.at>