diff options
author | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-07-13 16:56:20 +0200 |
---|---|---|
committer | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-07-13 16:56:20 +0200 |
commit | 354336490da0c1ee2c887bbf8f25b46610233608 (patch) | |
tree | e5e7f7bb84b2b8c20d701b18a0a79efc77877d2f /libavfilter/vf_delogo.c | |
parent | 3c058f570128dcfa3a68f0860e2be7f098e8d6e1 (diff) | |
parent | 846a3e78a535f05ee61bb23a160f3378f041f751 (diff) | |
download | ffmpeg-354336490da0c1ee2c887bbf8f25b46610233608.tar.gz |
Merge commit '846a3e78a535f05ee61bb23a160f3378f041f751'
* commit '846a3e78a535f05ee61bb23a160f3378f041f751':
mov: Support prores with multiple stsd
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
Diffstat (limited to 'libavfilter/vf_delogo.c')
0 files changed, 0 insertions, 0 deletions