Merge commit '5efd91284e56d444139ed811671c59a129bbb92f'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 15:36:38 +0000 (15:36 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 15:36:38 +0000 (15:36 +0000)
commit39fdffa7367763bbcd464832a67f0a3e19599639
tree0fa0cc7b8958cecadff8fb6561b8fc4b2613115f
parent14a69ae60c64a071eb65a8521bf3c339322f5903
parent5efd91284e56d444139ed811671c59a129bbb92f
Merge commit '5efd91284e56d444139ed811671c59a129bbb92f'

This commit is no-op. The affected piece of code does not
exist in FFmpeg.

* commit '5efd91284e56d444139ed811671c59a129bbb92f':
  avprobe: do not call avio_close() on a custom context

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