From 2029f312e8c13b25d322d69961b42db2e66f616a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 10 May 2007 09:00:44 +0000 Subject: [PATCH] Remove redundant #inclusion of common.h, avcodec.h already #includes it. Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/8bps.c | 1 - libavcodec/aasc.c | 1 - libavcodec/beosthread.c | 1 - libavcodec/cinepak.c | 1 - libavcodec/cook.c | 1 - libavcodec/cscd.c | 1 - libavcodec/cyuv.c | 1 - libavcodec/dsicinav.c | 1 - libavcodec/dsputil.h | 1 - libavcodec/dxa.c | 1 - libavcodec/error_resilience.c | 1 - libavcodec/ffv1.c | 3 +-- libavcodec/flashsv.c | 1 - libavcodec/flashsvenc.c | 1 - libavcodec/flicvideo.c | 1 - libavcodec/g726.c | 1 - libavcodec/h261.c | 1 - libavcodec/huffyuv.c | 3 +-- libavcodec/idcinvideo.c | 1 - libavcodec/indeo3.c | 1 - libavcodec/interplayvideo.c | 1 - libavcodec/kmvc.c | 1 - libavcodec/lcl.c | 3 +-- libavcodec/loco.c | 1 - libavcodec/msrle.c | 1 - libavcodec/msvideo1.c | 1 - libavcodec/nuv.c | 1 - libavcodec/os2thread.c | 1 - libavcodec/pthread.c | 1 - libavcodec/qtrle.c | 1 - libavcodec/rangecoder.c | 1 - libavcodec/resample2.c | 1 - libavcodec/roqvideo.c | 1 - libavcodec/rpza.c | 1 - libavcodec/smacker.c | 1 - libavcodec/smc.c | 1 - libavcodec/snow.c | 1 - libavcodec/svq1.c | 1 - libavcodec/tiertexseqv.c | 1 - libavcodec/truemotion1.c | 1 - libavcodec/truemotion2.c | 1 - libavcodec/tscc.c | 1 - libavcodec/ulti.c | 1 - libavcodec/vc1.c | 1 - libavcodec/vmdav.c | 1 - libavcodec/vmnc.c | 1 - libavcodec/vp3.c | 1 - libavcodec/vp3dsp.c | 1 - libavcodec/vqavideo.c | 1 - libavcodec/w32thread.c | 1 - libavcodec/wnv1.c | 1 - libavcodec/xan.c | 1 - libavcodec/xvidff.c | 1 - libavcodec/zmbv.c | 1 - libavcodec/zmbvenc.c | 1 - 55 files changed, 3 insertions(+), 58 deletions(-) diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index 961e46215e..e914a0d962 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -35,7 +35,6 @@ #include #include -#include "common.h" #include "avcodec.h" diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index f720f3eddb..2670c8d975 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -28,7 +28,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/beosthread.c b/libavcodec/beosthread.c index 3d059912b2..b1c65ddc1c 100644 --- a/libavcodec/beosthread.c +++ b/libavcodec/beosthread.c @@ -21,7 +21,6 @@ //#define DEBUG #include "avcodec.h" -#include "common.h" #include diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 012986bdf1..c67bea5c26 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -35,7 +35,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 33a43e1e59..72645d35f2 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -50,7 +50,6 @@ #include "avcodec.h" #include "bitstream.h" #include "dsputil.h" -#include "common.h" #include "bytestream.h" #include "random.h" diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 6177cbd429..36005a17b8 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -21,7 +21,6 @@ #include #include -#include "common.h" #include "avcodec.h" #ifdef CONFIG_ZLIB diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index 4d625e08fb..b607da0a29 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -35,7 +35,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c index 30027b1d92..7b4349b703 100644 --- a/libavcodec/dsicinav.c +++ b/libavcodec/dsicinav.c @@ -25,7 +25,6 @@ */ #include "avcodec.h" -#include "common.h" typedef enum CinVideoBitmapIndex { diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 800669ea7b..c860eb50ef 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -30,7 +30,6 @@ #ifndef DSPUTIL_H #define DSPUTIL_H -#include "common.h" #include "avcodec.h" diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 7675e71954..b4b6f9379a 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -28,7 +28,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 175ccf73ad..7aaaf85ec2 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -30,7 +30,6 @@ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" -#include "common.h" static void decode_mb(MpegEncContext *s){ s->dest[0] = s->current_picture.data[0] + (s->mb_y * 16* s->linesize ) + s->mb_x * 16; diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 45f408c876..ee5419cd3f 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -26,9 +26,8 @@ * FF Video Codec 1 (an experimental lossless codec) */ -#include "common.h" -#include "bitstream.h" #include "avcodec.h" +#include "bitstream.h" #include "dsputil.h" #include "rangecoder.h" #include "golomb.h" diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 41baf10717..0be0e464f5 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -50,7 +50,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "bitstream.h" diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index b975ed254b..ff3c85e01c 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -58,7 +58,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "bitstream.h" #include "bytestream.h" diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index bb0577352c..b2e5316f02 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -41,7 +41,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "bswap.h" diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 07af331226..01d1cec6f5 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -23,7 +23,6 @@ */ #include #include "avcodec.h" -#include "common.h" #include "bitstream.h" /** diff --git a/libavcodec/h261.c b/libavcodec/h261.c index 80dde7acd2..042e683f90 100644 --- a/libavcodec/h261.c +++ b/libavcodec/h261.c @@ -25,7 +25,6 @@ * h261codec. */ -#include "common.h" #include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index f68d8e7efd..fc3d94a978 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -28,9 +28,8 @@ * huffyuv codec for libavcodec. */ -#include "common.h" -#include "bitstream.h" #include "avcodec.h" +#include "bitstream.h" #include "dsputil.h" #define VLC_BITS 11 diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index 38f330c2e3..354a884443 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -50,7 +50,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index bd33d6da94..52fe2b849f 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -24,7 +24,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index a79e32383b..32406f76d7 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -40,7 +40,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index 8a190cb176..573f10c80d 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -28,7 +28,6 @@ #include #include -#include "common.h" #include "avcodec.h" #define KMVC_KEYFRAME 0x80 diff --git a/libavcodec/lcl.c b/libavcodec/lcl.c index f214b0a8b2..6f187f8734 100644 --- a/libavcodec/lcl.c +++ b/libavcodec/lcl.c @@ -42,9 +42,8 @@ #include #include -#include "common.h" -#include "bitstream.h" #include "avcodec.h" +#include "bitstream.h" #ifdef CONFIG_ZLIB #include diff --git a/libavcodec/loco.c b/libavcodec/loco.c index 760699d451..8b261cabc6 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -26,7 +26,6 @@ */ #include "avcodec.h" -#include "common.h" #include "bitstream.h" #include "golomb.h" diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index 5cb206170b..4b9dc0ce5b 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -36,7 +36,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index 459a6c5c93..2e8a4e959b 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -36,7 +36,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index e83927c99f..93637112a0 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -21,7 +21,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "bswap.h" diff --git a/libavcodec/os2thread.c b/libavcodec/os2thread.c index c52b7ae02e..82fd22e8a0 100644 --- a/libavcodec/os2thread.c +++ b/libavcodec/os2thread.c @@ -23,7 +23,6 @@ // Ported by Vlad Stelmahovsky #include "avcodec.h" -#include "common.h" #define INCL_DOS #define INCL_DOSERRORS diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index f2c636bbe9..d82753b9c8 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -25,7 +25,6 @@ #include #include "avcodec.h" -#include "common.h" typedef int (action_t)(AVCodecContext *c, void *arg); diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 5c6ccb4fb1..002dfcb345 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -37,7 +37,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index fcd564ace0..4e15ce3096 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -35,7 +35,6 @@ #include #include "avcodec.h" -#include "common.h" #include "rangecoder.h" diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c index d5e24fdfcd..f3d02169f5 100644 --- a/libavcodec/resample2.c +++ b/libavcodec/resample2.c @@ -27,7 +27,6 @@ */ #include "avcodec.h" -#include "common.h" #include "dsputil.h" #ifndef CONFIG_RESAMPLE_HP diff --git a/libavcodec/roqvideo.c b/libavcodec/roqvideo.c index 0ac97b297c..c7db30301c 100644 --- a/libavcodec/roqvideo.c +++ b/libavcodec/roqvideo.c @@ -31,7 +31,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c index 2a59109ac8..df79a23c86 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -40,7 +40,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index a079522eb4..78ee923001 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -32,7 +32,6 @@ #include #include -#include "common.h" #include "avcodec.h" #define ALT_BITSTREAM_READER_LE diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 7a617ec7d8..0875fd59b3 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -34,7 +34,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/snow.c b/libavcodec/snow.c index dc50941fac..df32d12632 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -19,7 +19,6 @@ */ #include "avcodec.h" -#include "common.h" #include "dsputil.h" #include "snow.h" diff --git a/libavcodec/svq1.c b/libavcodec/svq1.c index 5087ba8cc9..42fc6be196 100644 --- a/libavcodec/svq1.c +++ b/libavcodec/svq1.c @@ -41,7 +41,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c index c9229e5cce..85d585ea8f 100644 --- a/libavcodec/tiertexseqv.c +++ b/libavcodec/tiertexseqv.c @@ -25,7 +25,6 @@ */ #include "avcodec.h" -#include "common.h" #define ALT_BITSTREAM_READER_LE #include "bitstream.h" diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index c1326ac213..281ae83d53 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -34,7 +34,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index b282c967be..2217665061 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -26,7 +26,6 @@ */ #include "avcodec.h" -#include "common.h" #include "bitstream.h" #include "dsputil.h" diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index cc284088a5..fae3fa3dab 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -39,7 +39,6 @@ #include #include -#include "common.h" #include "avcodec.h" #ifdef CONFIG_ZLIB diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c index d84a88dad9..5c6ba00114 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -30,7 +30,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "ulti_cb.h" diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 40becae800..648c33e899 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -26,7 +26,6 @@ * VC-1 and WMV3 decoder * */ -#include "common.h" #include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index f10d57b3d7..e1a5c4715c 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -45,7 +45,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index e805ea0806..d432782d9e 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -29,7 +29,6 @@ #include #include -#include "common.h" #include "avcodec.h" enum EncTypes { diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index efe7017acc..7975a21076 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -35,7 +35,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c index bb9fed091f..fc8f54d8d6 100644 --- a/libavcodec/vp3dsp.c +++ b/libavcodec/vp3dsp.c @@ -24,7 +24,6 @@ * source code. */ -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index f266daf9f6..b13865dfe1 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -69,7 +69,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c index e749a64aff..58533a74c4 100644 --- a/libavcodec/w32thread.c +++ b/libavcodec/w32thread.c @@ -21,7 +21,6 @@ //#define DEBUG #include "avcodec.h" -#include "common.h" #define WIN32_LEAN_AND_MEAN #include diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 46b31a5c5f..fa427b524d 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -26,7 +26,6 @@ */ #include "avcodec.h" -#include "common.h" #include "bitstream.h" diff --git a/libavcodec/xan.c b/libavcodec/xan.c index c0e2db784f..b9e28cb3a2 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -34,7 +34,6 @@ #include #include -#include "common.h" #include "avcodec.h" typedef struct XanContext { diff --git a/libavcodec/xvidff.c b/libavcodec/xvidff.c index 590fe4b308..5b0698e794 100644 --- a/libavcodec/xvidff.c +++ b/libavcodec/xvidff.c @@ -27,7 +27,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include "xvid_internal.h" diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index a37fdd869a..6f7597380d 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -28,7 +28,6 @@ #include #include -#include "common.h" #include "avcodec.h" #ifdef CONFIG_ZLIB diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index 04e86235ac..c4c934e2fa 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -28,7 +28,6 @@ #include #include -#include "common.h" #include "avcodec.h" #include