Commit 6b783d2a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7046bd9b'

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

Conflicts:
	libavfilter/avfilter.h
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents fa7dec8c 7046bd9b
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#include "libavutil/timestamp.h" #include "libavutil/timestamp.h"
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
#include "libavcodec/avcodec.h"
#include "audio.h" #include "audio.h"
#include "avfilter.h" #include "avfilter.h"
#include "internal.h" #include "internal.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment