[FFmpeg-cvslog] Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 15 10:15:15 2013 +0200| [85de84c3e0396be2e51298ca26e405ce629a9fa9] | committer: Michael Niedermayer

Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'

* commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=85de84c3e0396be2e51298ca26e405ce629a9fa9
---