* commit '47a0d393':
  h264: move mb_skip_run into the per-slice context

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