* commit 'e9b2383b':
  h264: move mb_mbaff into the per-slice context

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