* commit '9951907f':
  h264: move redundant_pic_count into the per-slice context

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