summaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-19 18:28:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-19 18:30:37 +0200
commit6ca0a976b2e68c9aa36d2e0806d31eee66d9f482 (patch)
tree88cad30e474dba5bf79f270b684ce9d50d34672f /libavfilter
parent74a8dbe1c405e041a16c44050d9dfc92aca90d33 (diff)
parentd23fc8846d255e31896453136b4c77bc6d5e873f (diff)
downloadffmpeg-streaming-6ca0a976b2e68c9aa36d2e0806d31eee66d9f482.zip
ffmpeg-streaming-6ca0a976b2e68c9aa36d2e0806d31eee66d9f482.tar.gz
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>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/filtfmts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/filtfmts.c b/libavfilter/filtfmts.c
index e6c9b03..4133e9c 100644
--- a/libavfilter/filtfmts.c
+++ b/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"
OpenPOWER on IntegriCloud