Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 08:15:15 +0000 (10:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 08:15:15 +0000 (10:15 +0200)
commit85de84c3e0396be2e51298ca26e405ce629a9fa9
tree26140c81ba436e4f865dcce5d2e7855a9634f403
parent23439cf99bcf3e6f98bffdff8ba935506be31f2b
parent7cbc4cb4424430586ce2d5c0dba81174c6d1db01
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>
libavcodec/jpeg2000dec.c
libavformat/mmf.c