Merge commit '9e696d2e'

Merge only for metadata, functionality had been previously integrated.

* commit '9e696d2e':
  h264: support frame parameter changes during frame-mt

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