Merge commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 15:01:10 +0000 (16:01 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 15:01:22 +0000 (16:01 +0100)
commit6614214ece70f1d41d085d822ed02941601d6868
treef083b42c22425cb5ed7cc7f2900a54665d871d25
parent80195236c85d4bf8cd761bab8bc7b46dc33acb07
parent168a443d43b10ef6a3545d64b2f8bc90144ce4b7
Merge commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7'

* commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7':
  avprobe: print information from the codec descriptor

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