Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'

* commit 'd23fc8846d255e31896453136b4c77bc6d5e873f':
  filtfmts: remove unused lavf include

A include for channel_layout.h, is added otherwise compile would break

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

libavfilter/filtfmts.c

@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 
-#include "libavformat/avformat.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/samplefmt.h"
 #include "libavfilter/avfilter.h"