diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 16:33:04 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 16:33:13 +0100 |
commit | 9d48aa6d7df6fa50a8a2c30f5c1774af8a083db0 (patch) | |
tree | 84245010adfee690edfd711f8c0e75b4449814da /libavformat/vpk.c | |
parent | 95348174ef87b67f14609334ef177fe9e75c48c1 (diff) | |
parent | c9478410c68c04261f9cfcd80474607e50bd1852 (diff) | |
download | ffmpeg-9d48aa6d7df6fa50a8a2c30f5c1774af8a083db0.tar.gz |
Merge commit 'c9478410c68c04261f9cfcd80474607e50bd1852'
* commit 'c9478410c68c04261f9cfcd80474607e50bd1852':
avprobe: add local per-file state
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/vpk.c')
0 files changed, 0 insertions, 0 deletions