From 972cad77fa13ae312650dd0b7b99e484ffcb7949 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Fri, 22 Jun 2012 12:59:29 +0200
Subject: [PATCH] lavfi: remove unnecessary inclusion of libavcodec/avcodec.h
 in avfilter.h

libavfilter API was designed in order to be clarly distinguished from the
libavcodec API, including avcodec.h in avfilter.h is not going to help to
stick to this principle.

The inclusion of libavutil/audioconvert.h in many files was required
because avcodec.h includes audioconvert.h.

libavfilter/avcodec.h is where the lavc/lavfi interface should be
entirely placed.
---
 libavfilter/af_aconvert.c      | 1 +
 libavfilter/af_amerge.c        | 1 +
 libavfilter/af_aresample.c     | 1 +
 libavfilter/af_asetnsamples.c  | 1 +
 libavfilter/af_atempo.c        | 1 +
 libavfilter/af_pan.c           | 1 +
 libavfilter/af_silencedetect.c | 1 +
 libavfilter/avfilter.h         | 1 -
 libavfilter/avfiltergraph.c    | 1 +
 libavfilter/buffersrc.h        | 1 +
 libavfilter/graphdump.c        | 1 +
 11 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c
index 53d6b87cdd..d5bc6a8787 100644
--- a/libavfilter/af_aconvert.c
+++ b/libavfilter/af_aconvert.c
@@ -25,6 +25,7 @@
  * sample format and channel layout conversion audio filter
  */
 
+#include "libavutil/audioconvert.h"
 #include "libavutil/avstring.h"
 #include "libswresample/swresample.h"
 #include "avfilter.h"
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index f90412c16b..1d45856be3 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -23,6 +23,7 @@
  * Audio merging filter
  */
 
+#include "libavutil/audioconvert.h"
 #include "libavutil/bprint.h"
 #include "libavutil/opt.h"
 #include "libswresample/swresample.h" // only for SWR_CH_MAX
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index 685ed2fa50..170b5bcb13 100644
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@@ -24,6 +24,7 @@
  * resampling audio filter
  */
 
+#include "libavutil/audioconvert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "libavutil/samplefmt.h"
diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
index d371c98340..9ce43741b0 100644
--- a/libavfilter/af_asetnsamples.c
+++ b/libavfilter/af_asetnsamples.c
@@ -25,6 +25,7 @@
  */
 
 #include "libavutil/audio_fifo.h"
+#include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "avfilter.h"
diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c
index 445843968a..15d06d65c9 100644
--- a/libavfilter/af_atempo.c
+++ b/libavfilter/af_atempo.c
@@ -40,6 +40,7 @@
 
 #include <float.h>
 #include "libavcodec/avfft.h"
+#include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/eval.h"
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index cda40a7cdf..052bf7d3e4 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -28,6 +28,7 @@
  */
 
 #include <stdio.h>
+#include "libavutil/audioconvert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "libswresample/swresample.h"
diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c
index e8bf41bf16..5ef5f9654b 100644
--- a/libavfilter/af_silencedetect.c
+++ b/libavfilter/af_silencedetect.c
@@ -23,6 +23,7 @@
  * Audio silence detector
  */
 
+#include "libavutil/audioconvert.h"
 #include "libavutil/opt.h"
 #include "libavutil/timestamp.h"
 #include "audio.h"
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 5324cc5f22..d005433d70 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -27,7 +27,6 @@
 #include "libavutil/samplefmt.h"
 #include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
-#include "libavcodec/avcodec.h"
 
 #include <stddef.h>
 
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 8892e9decd..19b59a666d 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -26,6 +26,7 @@
 #include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
 #include "libavutil/pixdesc.h"
+#include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt2()
 #include "avfilter.h"
 #include "avfiltergraph.h"
 #include "formats.h"
diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h
index cd6492e5cb..adfb33022f 100644
--- a/libavfilter/buffersrc.h
+++ b/libavfilter/buffersrc.h
@@ -25,6 +25,7 @@
  * Memory buffer source API.
  */
 
+#include "libavcodec/avcodec.h"
 #include "avfilter.h"
 
 enum {
diff --git a/libavfilter/graphdump.c b/libavfilter/graphdump.c
index 28be29d567..c9d0fb0a7c 100644
--- a/libavfilter/graphdump.c
+++ b/libavfilter/graphdump.c
@@ -21,6 +21,7 @@
 
 #include <string.h>
 
+#include "libavutil/audioconvert.h"
 #include "libavutil/bprint.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"