* commit '92ebb332':
  mxf: Add additional H264 PictureEssenceCoding

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