* commit '271ce76d':
  h264: Parse registered data SEI message and AFD value

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_sei.c
	libavcodec/version.h

See: d6e95669
See: 22291c37Merged-by: Michael Niedermayer <michaelni@gmx.at>