Merge commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 18:46:13 +0000 (15:46 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 18:46:13 +0000 (15:46 -0300)
commitebe9808aaad6d2ac06851964bc86be4f13a6a1be
tree8d95b062eb60a1e6a9350c4adab5735ecc17a902
parent67eda469ab3440e875d3b6b03f6c325923eb7d53
parent905cdcaa9d081d3d945ce555b27b43a75c3af57b
Merge commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b'

* commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b':
  examples/decode_audio: Add missing header for av_free()

Merged-by: James Almer <jamrial@gmail.com>
doc/examples/decode_audio.c