Remove redundant #inclusion of common.h, avcodec.h already #includes it.

Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2024-11-23 19:30:05 +00:00 · 2007-05-10 09:00:44 +00:00 · 2007-05-10 09:00:44 +00:00 · 2029f312e8
commit 2029f312e8
parent 7c3a9fe2a3
55 changed files with 3 additions and 58 deletions
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@ -35,7 +35,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
 #include "avcodec.h"


--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/beosthread.c
+++ b/libavcodec/beosthread.c
@ -21,7 +21,6 @@
 //#define DEBUG

 #include "avcodec.h"
-#include "common.h"

 #include <OS.h>

--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@ -35,7 +35,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- 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"

--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
 #include "avcodec.h"

 #ifdef CONFIG_ZLIB
--- a/libavcodec/cyuv.c
+++ b/libavcodec/cyuv.c
@ -35,7 +35,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@ -25,7 +25,6 @@
 */

 #include "avcodec.h"
-#include "common.h"


 typedef enum CinVideoBitmapIndex {
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@ -30,7 +30,6 @@
 #ifndef DSPUTIL_H
 #define DSPUTIL_H

-#include "common.h"
 #include "avcodec.h"


--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
 #include "avcodec.h"

 #include <zlib.h>
--- 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;
--- 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"
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@ -50,7 +50,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
 #include "avcodec.h"
 #include "bitstream.h"

--- a/libavcodec/flashsvenc.c
+++ b/libavcodec/flashsvenc.c
@ -58,7 +58,6 @@
 #include <stdlib.h>
 #include <zlib.h>

-#include "common.h"
 #include "avcodec.h"
 #include "bitstream.h"
 #include "bytestream.h"
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@ -41,7 +41,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "bswap.h"

--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@ -23,7 +23,6 @@
 */
 #include <limits.h>
 #include "avcodec.h"
-#include "common.h"
 #include "bitstream.h"

 /**
--- 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"
--- 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
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@ -50,7 +50,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@ -24,7 +24,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@ -40,7 +40,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/kmvc.c
+++ b/libavcodec/kmvc.c
@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
 #include "avcodec.h"

 #define KMVC_KEYFRAME 0x80
--- a/libavcodec/lcl.c
+++ b/libavcodec/lcl.c
@ -42,9 +42,8 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
-#include "bitstream.h"
 #include "avcodec.h"
+#include "bitstream.h"

 #ifdef CONFIG_ZLIB
 #include <zlib.h>
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@ -26,7 +26,6 @@
 */

 #include "avcodec.h"
-#include "common.h"
 #include "bitstream.h"
 #include "golomb.h"

--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@ -36,7 +36,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@ -36,7 +36,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
 #include "avcodec.h"

 #include "bswap.h"
--- 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
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@ -25,7 +25,6 @@
 #include <pthread.h>

 #include "avcodec.h"
-#include "common.h"

 typedef int (action_t)(AVCodecContext *c, void *arg);

--- a/libavcodec/qtrle.c
+++ b/libavcodec/qtrle.c
@ -37,7 +37,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/rangecoder.c
+++ b/libavcodec/rangecoder.c
@ -35,7 +35,6 @@
 #include <string.h>

 #include "avcodec.h"
-#include "common.h"
 #include "rangecoder.h"


--- 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
--- a/libavcodec/roqvideo.c
+++ b/libavcodec/roqvideo.c
@ -31,7 +31,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@ -40,7 +40,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@ -32,7 +32,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
 #include "avcodec.h"

 #define ALT_BITSTREAM_READER_LE
--- a/libavcodec/smc.c
+++ b/libavcodec/smc.c
@ -34,7 +34,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@ -19,7 +19,6 @@
 */

 #include "avcodec.h"
-#include "common.h"
 #include "dsputil.h"
 #include "snow.h"

--- a/libavcodec/svq1.c
+++ b/libavcodec/svq1.c
@ -41,7 +41,6 @@
 #include <unistd.h>
 #include <limits.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
--- 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"

--- a/libavcodec/truemotion1.c
+++ b/libavcodec/truemotion1.c
@ -34,7 +34,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@ -26,7 +26,6 @@
 */

 #include "avcodec.h"
-#include "common.h"
 #include "bitstream.h"
 #include "dsputil.h"

--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@ -39,7 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
 #include "avcodec.h"

 #ifdef CONFIG_ZLIB
--- a/libavcodec/ulti.c
+++ b/libavcodec/ulti.c
@ -30,7 +30,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"

 #include "ulti_cb.h"
--- 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"
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@ -45,7 +45,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
 #include "avcodec.h"

 enum EncTypes {
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@ -35,7 +35,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
--- a/libavcodec/vp3dsp.c
+++ b/libavcodec/vp3dsp.c
@ -24,7 +24,6 @@
 * source code.
 */

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@ -69,7 +69,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"

--- 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 <windows.h>
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@ -26,7 +26,6 @@
 */

 #include "avcodec.h"
-#include "common.h"
 #include "bitstream.h"


--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@ -34,7 +34,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "common.h"
 #include "avcodec.h"

 typedef struct XanContext {
--- a/libavcodec/xvidff.c
+++ b/libavcodec/xvidff.c
@ -27,7 +27,6 @@

 #include <xvid.h>
 #include <unistd.h>
-#include "common.h"
 #include "avcodec.h"
 #include "xvid_internal.h"

--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
 #include "avcodec.h"

 #ifdef CONFIG_ZLIB
--- a/libavcodec/zmbvenc.c
+++ b/libavcodec/zmbvenc.c
@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "common.h"
 #include "avcodec.h"

 #include <zlib.h>