Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 May 2015 17:03:51 +0000 (19:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 May 2015 17:14:11 +0000 (19:14 +0200)
commit6b783d2acea049d3ebbfe1352b55c8efe8b5168c
treebfa6b3922e5969c976dcbb096ca6845df8136650
parentfa7dec8cb00d2d0dd96ff9863ccda38428610a21
parent7046bd9bc9ce04521edf453c9b603d84d69c7512
Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'

* commit '7046bd9bc9ce04521edf453c9b603d84d69c7512':
  lavfi: Move avcodec header to the only filter needing it

Conflicts:
libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_ashowinfo.c