* commit 'f69574cf':
  h264: move non_zero_count_cache into the per-slice context

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