1. ffmpeg
  2. Commit 8e981daf2b0339643be1e2d3003faf6414e752d8
Browse code

make some symbols static

Originally committed as revision 6972 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård authored on 2006/11/12 05:54:48
Showing 8 changed files
libavcodec/8bps.c
History View file @ 8e981da
... ... 
@@ -39,7 +39,7 @@
39 39 
 #include "avcodec.h"
40 40
41 41
42 
-const enum PixelFormat pixfmt_rgb24[] = {PIX_FMT_BGR24, PIX_FMT_RGBA32, -1};
42 
+static const enum PixelFormat pixfmt_rgb24[] = {PIX_FMT_BGR24, PIX_FMT_RGBA32, -1};
43 43
44 44 
 /*
45 45 
  * Decoder context
libavcodec/dtsdec.c
History View file @ 8e981da
... ... 
@@ -55,7 +55,7 @@ int16_t convert (int32_t i)
55 55 
     return (i > 32767) ? 32767 : ((i < -32768) ? -32768 : i);
56 56 
 }
57 57
58 
-void
58 
+static void
59 59 
 convert2s16_2 (sample_t * _f, int16_t * s16)
60 60 
 {
61 61 
   int i;
... ... 
@@ -68,7 +68,7 @@ convert2s16_2 (sample_t * _f, int16_t * s16)
68 68 
     }
69 69 
 }
70 70
71 
-void
71 
+static void
72 72 
 convert2s16_4 (sample_t * _f, int16_t * s16)
73 73 
 {
74 74 
   int i;
... ... 
@@ -83,7 +83,7 @@ convert2s16_4 (sample_t * _f, int16_t * s16)
83 83 
     }
84 84 
 }
85 85
86 
-void
86 
+static void
87 87 
 convert2s16_5 (sample_t * _f, int16_t * s16)
88 88 
 {
89 89 
   int i;
libavcodec/faac.c
History View file @ 8e981da
... ... 
@@ -95,8 +95,8 @@ static int Faac_encode_init(AVCodecContext *avctx)
95 95 
     return 0;
96 96 
 }
97 97
98 
-int Faac_encode_frame(AVCodecContext *avctx,
99 
-                      unsigned char *frame, int buf_size, void *data)
98 
+static int Faac_encode_frame(AVCodecContext *avctx,
99 
+                             unsigned char *frame, int buf_size, void *data)
100 100 
 {
101 101 
     FaacAudioContext *s = avctx->priv_data;
102 102 
     int bytes_written;
... ... 
@@ -110,7 +110,7 @@ int Faac_encode_frame(AVCodecContext *avctx,
110 110 
     return bytes_written;
111 111 
 }
112 112
113 
-int Faac_encode_close(AVCodecContext *avctx)
113 
+static int Faac_encode_close(AVCodecContext *avctx)
114 114 
 {
115 115 
     FaacAudioContext *s = avctx->priv_data;
116 116
libavcodec/h261data.h
History View file @ 8e981da
... ... 
@@ -26,7 +26,7 @@
26 26 
 #define MB_TYPE_H261_FIL 0x800000
27 27
28 28 
 // H.261 VLC table for macroblock addressing
29 
-const uint8_t h261_mba_code[35] = {
29 
+static const uint8_t h261_mba_code[35] = {
30 30 
      1,  3,  2,  3,
31 31 
      2,  3,  2,  7,
32 32 
      6, 11, 10,  9,
... ... 
@@ -40,7 +40,7 @@ const uint8_t h261_mba_code[35] = {
40 40 
     1             //(start code)
41 41 
 };
42 42
43 
-const uint8_t h261_mba_bits[35] = {
43 
+static const uint8_t h261_mba_bits[35] = {
44 44 
      1,  3,  3,  4,
45 45 
      4,  5,  5,  7,
46 46 
      7,  8,  8,  8,
... ... 
@@ -55,13 +55,13 @@ const uint8_t h261_mba_bits[35] = {
55 55 
 };
56 56
57 57 
 //H.261 VLC table for macroblock type
58 
-const uint8_t h261_mtype_code[10] = {
58 
+static const uint8_t h261_mtype_code[10] = {
59 59 
     1,  1,  1,  1,
60 60 
     1,  1,  1,  1,
61 61 
     1,  1
62 62 
 };
63 63
64 
-const uint8_t h261_mtype_bits[10] = {
64 
+static const uint8_t h261_mtype_bits[10] = {
65 65 
     4,  7,  1,  5,
66 66 
     9,  8, 10,  3,
67 67 
     2,  6
... ... 
@@ -81,7 +81,7 @@ static const int h261_mtype_map[10]= {
81 81 
 };
82 82
83 83 
 //H.261 VLC table for motion vectors
84 
-const uint8_t h261_mv_tab[17][2] = {
84 
+static const uint8_t h261_mv_tab[17][2] = {
85 85 
     {1,1}, {1,2}, {1,3}, {1,4}, {3,6}, {5,7}, {4,7}, {3,7},
86 86 
     {11,9}, {10,9}, {9,9}, {17,10}, {16,10}, {15,10}, {14,10}, {13,10}, {12,10}
87 87 
 };
... ... 
@@ -92,7 +92,7 @@ static const int mvmap[17] =
92 92 
 };
93 93
94 94 
 //H.261 VLC table for coded block pattern
95 
-const uint8_t h261_cbp_tab[63][2] =
95 
+static const uint8_t h261_cbp_tab[63][2] =
96 96 
 {
97 97 
     {11,5}, {9,5}, {13,6}, {13,4}, {23,7}, {19,7}, {31,8}, {12,4},
98 98 
     {22,7}, {18,7}, {30,8}, {19,5}, {27,8}, {23,8}, {19,8}, {11,4},
... ... 
@@ -105,7 +105,7 @@ const uint8_t h261_cbp_tab[63][2] =
105 105 
 };
106 106
107 107 
 //H.261 VLC table for transform coefficients
108 
-const uint16_t h261_tcoeff_vlc[65][2] = {
108 
+static const uint16_t h261_tcoeff_vlc[65][2] = {
109 109 
 { 0x2, 2 }, { 0x3, 2 },{ 0x4, 4 },{ 0x5, 5 },
110 110 
 { 0x6, 7 },{ 0x26, 8 },{ 0x21, 8 },{ 0xa, 10 },
111 111 
 { 0x1d, 12 },{ 0x18, 12 },{ 0x13, 12 },{ 0x10 , 12 },
... ... 
@@ -125,7 +125,7 @@ const uint16_t h261_tcoeff_vlc[65][2] = {
125 125 
 { 0x1, 6 }                                             //escape
126 126 
 };
127 127
128 
-const int8_t h261_tcoeff_level[64] = {
128 
+static const int8_t h261_tcoeff_level[64] = {
129 129 
     0,  1,  2,  3,  4,  5,  6,  7,
130 130 
     8,  9, 10, 11, 12, 13, 14, 15,
131 131 
     1,  2,  3,  4,  5,  6,  7,  1,
... ... 
@@ -136,7 +136,7 @@ const int8_t h261_tcoeff_level[64] = {
136 136 
     1,  1,  1,  1,  1,  1,  1,  1
137 137 
 };
138 138
139 
-const int8_t h261_tcoeff_run[64] = {
139 
+static const int8_t h261_tcoeff_run[64] = {
140 140 
     0,
141 141 
     0,  0,  0,  0,  0,  0,  0,  0,
142 142 
     0,  0,  0,  0,  0,  0,  0,  1,
libavcodec/imc.c
History View file @ 8e981da
... ... 
@@ -538,7 +538,7 @@ static void imc_adjust_bit_allocation (IMCContext* q, int summer) {
538 538 
     }
539 539 
 }
540 540
541 
-void imc_imdct256(IMCContext *q) {
541 
+static void imc_imdct256(IMCContext *q) {
542 542 
     int i;
543 543 
     float re, im;
544 544
libavcodec/mp3lameaudio.c
History View file @ 8e981da
... ... 
@@ -135,8 +135,8 @@ static int mp3len(void *data, int *samplesPerFrame, int *sampleRate)
135 135 
     return *samplesPerFrame * bitRate / (bitsPerSlot * *sampleRate) + isPadded;
136 136 
 }
137 137
138 
-int MP3lame_encode_frame(AVCodecContext *avctx,
139 
-                     unsigned char *frame, int buf_size, void *data)
138 
+static int MP3lame_encode_frame(AVCodecContext *avctx,
139 
+                                unsigned char *frame, int buf_size, void *data)
140 140 
 {
141 141 
     Mp3AudioContext *s = avctx->priv_data;
142 142 
     int len;
... ... 
@@ -198,7 +198,7 @@ int MP3lame_encode_frame(AVCodecContext *avctx,
198 198 
             return 0;
199 199 
 }
200 200
201 
-int MP3lame_encode_close(AVCodecContext *avctx)
201 
+static int MP3lame_encode_close(AVCodecContext *avctx)
202 202 
 {
203 203 
     Mp3AudioContext *s = avctx->priv_data;
204 204
libavcodec/raw.c
History View file @ 8e981da
... ... 
@@ -37,7 +37,7 @@ typedef struct PixelFormatTag {
37 37 
     unsigned int fourcc;
38 38 
 } PixelFormatTag;
39 39
40 
-const PixelFormatTag pixelFormatTags[] = {
40 
+static const PixelFormatTag pixelFormatTags[] = {
41 41 
     { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */
42 42 
     { PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') },
43 43 
     { PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') },
libavcodec/xl.c
History View file @ 8e981da
... ... 
@@ -33,7 +33,7 @@ typedef struct VideoXLContext{
33 33 
     AVFrame pic;
34 34 
 } VideoXLContext;
35 35
36 
-const int xl_table[32] = {
36 
+static const int xl_table[32] = {
37 37 
    0,   1,   2,   3,   4,   5,   6,   7,
38 38 
    8,   9,  12,  15,  20,  25,  34,  46,
39 39 
   64,  82,  94, 103, 108, 113, 116, 119,