* commit '31d2039c':
  h264_parser: export video format and dimensions

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