Michael Niedermayer 85de84c3e0 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@gmx.at>

2013-05-15 10:15:15 +02:00

9.3 KiB

Raw Blame History

View Raw