[FFmpeg-cvslog] Merge commit '6a928293dd29c7f0dcf09107980a1d651c9957df'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug  3 19:18:13 2014 +0200| [f1d6fc779450715fda20e7844ffc6364e50f5a3e] | committer: Michael Niedermayer

Merge commit '6a928293dd29c7f0dcf09107980a1d651c9957df'

* commit '6a928293dd29c7f0dcf09107980a1d651c9957df':
  examples: filter_audio: Add missing mem.h header for av_freep()

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1d6fc779450715fda20e7844ffc6364e50f5a3e
---