From: Derek Buitenhuis Date: Mon, 29 Feb 2016 15:36:38 +0000 (+0000) Subject: Merge commit '5efd91284e56d444139ed811671c59a129bbb92f' X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=39fdffa7367763bbcd464832a67f0a3e19599639;p=ffmpeg 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 --- 39fdffa7367763bbcd464832a67f0a3e19599639