* commit 'c377e04d':
  h264: move top_borders into the per-slice context

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