[FFmpeg-cvslog] avcodec: fix duplicate includes

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 21 16:59:13 2013 +0200| [a072acb108f38bc99b53476a50ea04b7500ce910] | committer: Michael Niedermayer

avcodec: fix duplicate includes

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a072acb108f38bc99b53476a50ea04b7500ce910
---

 libavcodec/cabac.c      |    1 -
 libavcodec/dnxhdenc.c   |    1 -
 libavcodec/g723_1.c     |    1 -
 libavcodec/msmpeg4enc.c |    1 -
 libavcodec/sipr16k.c    |    1 -
 libavcodec/snowenc.c    |    1 -
 libavcodec/utils.c      |    1 -
 7 files changed, 7 deletions(-)

diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index 187b7dc..1d04292 100644
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -174,7 +174,6 @@ void ff_init_cabac_states(void)
 
 #include "libavutil/lfg.h"
 #include "avcodec.h"
-#include "cabac.h"
 
 static inline void put_cabac_bit(CABACContext *c, int b){
     put_bits(&c->pb, 1, b);
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 6bfd88a..8d2b8b3 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -33,7 +33,6 @@
 #include "internal.h"
 #include "mpegvideo.h"
 #include "dnxhdenc.h"
-#include "internal.h"
 
 #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
 #define DNX10BIT_QMAT_SHIFT 18 // The largest value that will not lead to overflow for 10bit samples.
diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c
index 6254c9a..38fbcbd 100644
--- a/libavcodec/g723_1.c
+++ b/libavcodec/g723_1.c
@@ -30,7 +30,6 @@
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
-#include "internal.h"
 #include "get_bits.h"
 #include "acelp_vectors.h"
 #include "celp_filters.h"
diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c
index 74e2c4d..e7f51db 100644
--- a/libavcodec/msmpeg4enc.c
+++ b/libavcodec/msmpeg4enc.c
@@ -34,7 +34,6 @@
 #include "libavutil/avutil.h"
 #include "libavutil/mem.h"
 #include "mpegvideo.h"
-#include "msmpeg4.h"
 #include "h263.h"
 #include "mpeg4video.h"
 #include "msmpeg4.h"
diff --git a/libavcodec/sipr16k.c b/libavcodec/sipr16k.c
index 9cc5e9b..bfd8ade 100644
--- a/libavcodec/sipr16k.c
+++ b/libavcodec/sipr16k.c
@@ -29,7 +29,6 @@
 #include "libavutil/float_dsp.h"
 #include "libavutil/mathematics.h"
 #include "lsp.h"
-#include "celp_filters.h"
 #include "acelp_vectors.h"
 #include "acelp_pitch_delay.h"
 #include "acelp_filters.h"
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 9a2d219..57824d1 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -22,7 +22,6 @@
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
-#include "internal.h"
 #include "dsputil.h"
 #include "internal.h"
 #include "snow_dwt.h"
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index e3f7ee2..c5b203e 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -40,7 +40,6 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/samplefmt.h"
 #include "libavutil/dict.h"
-#include "libavutil/avassert.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "libavutil/opt.h"