* commit '7cbc4cb4':
  fate: update the mmf reference
  mmf: Write metadata into an Optional Data chunk
  jpeg2000dec: Use correct printf length modifier for pointer differences

Conflicts:
	libavformat/mmf.c
	tests/ref/lavf/mmf
Merged-by: Michael Niedermayer <michaelni@gmx.at>