diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 22:33:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 22:59:16 +0100 |
| commit | 0dcebe26209fbda0bac54789406e0a30c3a08247 (patch) | |
| tree | 1d3fde22f4313ced12e038f1617d6a86fc86e79b /libavcodec/options.c | |
| parent | 420aebf0c585e54468e631460065448c9bb6ccb5 (diff) | |
| parent | b704b648f9ecb830874627db958a37e004107d1b (diff) | |
| download | ffmpeg-0dcebe26209fbda0bac54789406e0a30c3a08247.tar.gz | |
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>
Diffstat (limited to 'libavcodec/options.c')
0 files changed, 0 insertions, 0 deletions