* commit '64c81b2c':
  h264: move *_samples_available into the per-slice context

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