[FFmpeg-cvslog] Merge commit 'b704b648f9ecb830874627db958a37e004107d1b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  8 22:33:38 2014 +0100| [0dcebe26209fbda0bac54789406e0a30c3a08247] | committer: Michael Niedermayer

Merge commit 'b704b648f9ecb830874627db958a37e004107d1b'

* commit 'b704b648f9ecb830874627db958a37e004107d1b':
  mov: parse XMP metadata on demand

Conflicts:
	libavformat/isom.h
	libavformat/version.h

See: 054c506e3da35471ea92dbedcaaf720d0754f04e

The default is left unchanged at enabled
We can change the default if people prefer but i do not want to do that
in a merge.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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