diff options
author | James Almer <jamrial@gmail.com> | 2017-09-28 00:09:20 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-09-28 00:10:42 -0300 |
commit | d99c3af7072d0011c4f2cbedb2f624e6b616cfc0 (patch) | |
tree | 7ae25b82a8c95c0937243732399ebc8e658071ba /libavfilter/vf_phase.c | |
parent | 2838ab65ccf5e3ceefe9819c1aee6edd7f3e4d90 (diff) | |
parent | b446f0e98f85e2e931b476e52b319f1c49244660 (diff) | |
download | ffmpeg-d99c3af7072d0011c4f2cbedb2f624e6b616cfc0.tar.gz |
Merge commit 'b446f0e98f85e2e931b476e52b319f1c49244660'
* commit 'b446f0e98f85e2e931b476e52b319f1c49244660':
mov: Do not try to parse multiple stsd for the same track
See 8b43ee4054af799e388d380b379a13a60849c1b5
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/vf_phase.c')
0 files changed, 0 insertions, 0 deletions