aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_thumbnail.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-09-28 00:09:20 -0300
committerJames Almer <jamrial@gmail.com>2017-09-28 00:10:42 -0300
commitd99c3af7072d0011c4f2cbedb2f624e6b616cfc0 (patch)
tree7ae25b82a8c95c0937243732399ebc8e658071ba /libavfilter/vf_thumbnail.c
parent2838ab65ccf5e3ceefe9819c1aee6edd7f3e4d90 (diff)
parentb446f0e98f85e2e931b476e52b319f1c49244660 (diff)
downloadffmpeg-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_thumbnail.c')
0 files changed, 0 insertions, 0 deletions