Merge commit 'c9478410c68c04261f9cfcd80474607e50bd1852'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 15:33:04 +0000 (16:33 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 15:33:13 +0000 (16:33 +0100)
commit9d48aa6d7df6fa50a8a2c30f5c1774af8a083db0
tree84245010adfee690edfd711f8c0e75b4449814da
parent95348174ef87b67f14609334ef177fe9e75c48c1
parentc9478410c68c04261f9cfcd80474607e50bd1852
Merge commit 'c9478410c68c04261f9cfcd80474607e50bd1852'

* commit 'c9478410c68c04261f9cfcd80474607e50bd1852':
  avprobe: add local per-file state

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
ffprobe.c