* commit '632ad224':
  lavc: Add an internal wrapper around get_format()

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