* commit 'b0017579':
  h264: Add support for Closed Caption export

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

See: 8234f0e3Merged-by: Michael Niedermayer <michael@niedermayer.cc>