Merge commit '7046bd9b'

* commit '7046bd9b':
  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

@@ -37,6 +37,8 @@
 #include "libavutil/timestamp.h"
 #include "libavutil/samplefmt.h"
 
+#include "libavcodec/avcodec.h"
+
 #include "audio.h"
 #include "avfilter.h"
 #include "internal.h"