]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '6a928293dd29c7f0dcf09107980a1d651c9957df'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 17:18:13 +0000 (19:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 17:18:25 +0000 (19:18 +0200)
* commit '6a928293dd29c7f0dcf09107980a1d651c9957df':
  examples: filter_audio: Add missing mem.h header for av_freep()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/examples/filter_audio.c

Simple merge