* qatar/master:
  h264: Split h264 slice decoding from nal decoding

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