* commit '61928b68':
  h264: Do not share rbsp_buffer across threads

Conflicts:
	libavcodec/h264.c

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