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)
* commit '7046bd9bc9ce04521edf453c9b603d84d69c7512':
  lavfi: Move avcodec header to the only filter needing it

Conflicts:
libavfilter/avfilter.h

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

  #include "libavutil/intreadwrite.h"
  #include "libavutil/mem.h"
  #include "libavutil/replaygain.h"
 +#include "libavutil/timestamp.h"
  #include "libavutil/samplefmt.h"
  
+ #include "libavcodec/avcodec.h"
  #include "audio.h"
  #include "avfilter.h"
  #include "internal.h"