diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 20:14:51 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 20:15:21 +0200 |
commit | afb327caf3d1fe873ac0c46aa9af89dd5fb471f2 (patch) | |
tree | 80512dc2a6b4c9c522cf9fd562d9bcb60baa5bde /libpostproc | |
parent | aa6f58dd96f32ccf74315da996a5514af6c09687 (diff) | |
parent | 072198166e9a333662042deef066fe41b3ad8070 (diff) | |
download | ffmpeg-afb327caf3d1fe873ac0c46aa9af89dd5fb471f2.tar.gz |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/mov: Do not overread iTunes metadata.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc')
0 files changed, 0 insertions, 0 deletions