]> git.sesse.net Git - ffmpeg/commit
Merge commit '567d6d5f9d1400f00445183b3477391f58979aa3'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 15:46:22 +0000 (16:46 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 15:46:30 +0000 (16:46 +0100)
commit48fb5294d03f1d25ec8ba370a0cb4258fc21e88e
tree23de73100a257878069ed0cf9875fb99dfaca128
parent9d48aa6d7df6fa50a8a2c30f5c1774af8a083db0
parent567d6d5f9d1400f00445183b3477391f58979aa3
Merge commit '567d6d5f9d1400f00445183b3477391f58979aa3'

* commit '567d6d5f9d1400f00445183b3477391f58979aa3':
  avprobe: add local per-stream state

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