Merge commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 14:30:47 +0000 (15:30 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 14:30:55 +0000 (15:30 +0100)
commit80195236c85d4bf8cd761bab8bc7b46dc33acb07
tree811b1d0b79a6035ab0b3018fcf0cf115633a52a0
parentc921f4f687971a62f9eb16eadfad99de53c92064
parente7188a1a84817b8d4337340c21c552ad0b6cb2fd
Merge commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd'

* commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd':
  avprobe: remove a pointless condition and a dead branch

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