Merge commit 'ba357e98691ee4fe1a503b8830c0050be4127475'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 12 Apr 2016 14:37:48 +0000 (15:37 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 12 Apr 2016 14:38:03 +0000 (15:38 +0100)
commit9080dc7f0742046ec42b717a151c8be6e90211ae
tree76f098bdbc238aae98ca9ce702c609e3aa8d63c4
parent9149e9c0baaec122bc3da925d6068dffa60b5427
parentba357e98691ee4fe1a503b8830c0050be4127475
Merge commit 'ba357e98691ee4fe1a503b8830c0050be4127475'

* commit 'ba357e98691ee4fe1a503b8830c0050be4127475':
  avprobe: switch to codecpar

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