Merge commit '6135c3b61e084be93c0876cecd06f4e764f961c0'
authorClément Bœsch <cboesch@gopro.com>
Thu, 2 Feb 2017 10:29:53 +0000 (11:29 +0100)
committerClément Bœsch <cboesch@gopro.com>
Thu, 2 Feb 2017 10:29:53 +0000 (11:29 +0100)
commit5e013586bf9a031275b78aaaba0d97f2319d58a5
treeca64d0de007b747d21920d91ca0fe61f2206e480
parent55b2cfa921c3ad5a821fc0ec85093a658b102caa
parent6135c3b61e084be93c0876cecd06f4e764f961c0
Merge commit '6135c3b61e084be93c0876cecd06f4e764f961c0'

* commit '6135c3b61e084be93c0876cecd06f4e764f961c0':
  Revert "avprobe: Zero the allocated avio buffer memory"

This commit is a noop, see 591cf8aa0ee9e09aac29861f4229616df7604172

Merged-by: Clément Bœsch <cboesch@gopro.com>