aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg.txt
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-04 20:14:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-04 20:15:21 +0200
commitafb327caf3d1fe873ac0c46aa9af89dd5fb471f2 (patch)
tree80512dc2a6b4c9c522cf9fd562d9bcb60baa5bde /doc/ffmpeg.txt
parentaa6f58dd96f32ccf74315da996a5514af6c09687 (diff)
parent072198166e9a333662042deef066fe41b3ad8070 (diff)
downloadffmpeg-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 'doc/ffmpeg.txt')
0 files changed, 0 insertions, 0 deletions