* commit '9d76dd95':
  h264: drop commented out cruft

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