* commit 'ce423163':
  h264: Always invoke the get_format() callback

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