ffmpeg/libavformat
Michael Niedermayer 0dcebe2620 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@gmx.at>
2014-12-08 22:59:16 +01:00
..
2014-08-24 11:05:42 +00:00
2014-12-01 00:31:06 +01:00
2014-10-20 10:38:38 +01:00
2014-11-19 11:17:43 +01:00
2014-12-02 02:01:11 +01:00
2014-08-30 15:50:22 +00:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00
2014-11-04 14:11:53 +01:00
2014-10-20 10:38:37 +01:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00
2014-09-30 20:21:14 +02:00
2014-12-07 21:50:47 +01:00
2014-11-06 09:05:37 +01:00
2014-08-30 16:38:14 +02:00
2014-08-24 11:05:42 +00:00
2014-12-02 11:40:01 +01:00
2014-09-24 23:33:26 +03:00
2014-10-21 03:52:27 +02:00
2014-10-24 09:53:45 +03:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00
2014-09-30 20:21:14 +02:00
2014-10-22 23:12:38 +02:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00