Originally committed as revision 6972 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -39,7 +39,7 @@ | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| const enum PixelFormat pixfmt_rgb24[] = {PIX_FMT_BGR24, PIX_FMT_RGBA32, -1}; | |||||
| static const enum PixelFormat pixfmt_rgb24[] = {PIX_FMT_BGR24, PIX_FMT_RGBA32, -1}; | |||||
| /* | /* | ||||
| * Decoder context | * Decoder context | ||||
| @@ -55,7 +55,7 @@ int16_t convert (int32_t i) | |||||
| return (i > 32767) ? 32767 : ((i < -32768) ? -32768 : i); | return (i > 32767) ? 32767 : ((i < -32768) ? -32768 : i); | ||||
| } | } | ||||
| void | |||||
| static void | |||||
| convert2s16_2 (sample_t * _f, int16_t * s16) | convert2s16_2 (sample_t * _f, int16_t * s16) | ||||
| { | { | ||||
| int i; | int i; | ||||
| @@ -68,7 +68,7 @@ convert2s16_2 (sample_t * _f, int16_t * s16) | |||||
| } | } | ||||
| } | } | ||||
| void | |||||
| static void | |||||
| convert2s16_4 (sample_t * _f, int16_t * s16) | convert2s16_4 (sample_t * _f, int16_t * s16) | ||||
| { | { | ||||
| int i; | int i; | ||||
| @@ -83,7 +83,7 @@ convert2s16_4 (sample_t * _f, int16_t * s16) | |||||
| } | } | ||||
| } | } | ||||
| void | |||||
| static void | |||||
| convert2s16_5 (sample_t * _f, int16_t * s16) | convert2s16_5 (sample_t * _f, int16_t * s16) | ||||
| { | { | ||||
| int i; | int i; | ||||
| @@ -95,8 +95,8 @@ static int Faac_encode_init(AVCodecContext *avctx) | |||||
| return 0; | return 0; | ||||
| } | } | ||||
| int Faac_encode_frame(AVCodecContext *avctx, | |||||
| unsigned char *frame, int buf_size, void *data) | |||||
| static int Faac_encode_frame(AVCodecContext *avctx, | |||||
| unsigned char *frame, int buf_size, void *data) | |||||
| { | { | ||||
| FaacAudioContext *s = avctx->priv_data; | FaacAudioContext *s = avctx->priv_data; | ||||
| int bytes_written; | int bytes_written; | ||||
| @@ -110,7 +110,7 @@ int Faac_encode_frame(AVCodecContext *avctx, | |||||
| return bytes_written; | return bytes_written; | ||||
| } | } | ||||
| int Faac_encode_close(AVCodecContext *avctx) | |||||
| static int Faac_encode_close(AVCodecContext *avctx) | |||||
| { | { | ||||
| FaacAudioContext *s = avctx->priv_data; | FaacAudioContext *s = avctx->priv_data; | ||||
| @@ -26,7 +26,7 @@ | |||||
| #define MB_TYPE_H261_FIL 0x800000 | #define MB_TYPE_H261_FIL 0x800000 | ||||
| // H.261 VLC table for macroblock addressing | // H.261 VLC table for macroblock addressing | ||||
| const uint8_t h261_mba_code[35] = { | |||||
| static const uint8_t h261_mba_code[35] = { | |||||
| 1, 3, 2, 3, | 1, 3, 2, 3, | ||||
| 2, 3, 2, 7, | 2, 3, 2, 7, | ||||
| 6, 11, 10, 9, | 6, 11, 10, 9, | ||||
| @@ -40,7 +40,7 @@ const uint8_t h261_mba_code[35] = { | |||||
| 1 //(start code) | 1 //(start code) | ||||
| }; | }; | ||||
| const uint8_t h261_mba_bits[35] = { | |||||
| static const uint8_t h261_mba_bits[35] = { | |||||
| 1, 3, 3, 4, | 1, 3, 3, 4, | ||||
| 4, 5, 5, 7, | 4, 5, 5, 7, | ||||
| 7, 8, 8, 8, | 7, 8, 8, 8, | ||||
| @@ -55,13 +55,13 @@ const uint8_t h261_mba_bits[35] = { | |||||
| }; | }; | ||||
| //H.261 VLC table for macroblock type | //H.261 VLC table for macroblock type | ||||
| const uint8_t h261_mtype_code[10] = { | |||||
| static const uint8_t h261_mtype_code[10] = { | |||||
| 1, 1, 1, 1, | 1, 1, 1, 1, | ||||
| 1, 1, 1, 1, | 1, 1, 1, 1, | ||||
| 1, 1 | 1, 1 | ||||
| }; | }; | ||||
| const uint8_t h261_mtype_bits[10] = { | |||||
| static const uint8_t h261_mtype_bits[10] = { | |||||
| 4, 7, 1, 5, | 4, 7, 1, 5, | ||||
| 9, 8, 10, 3, | 9, 8, 10, 3, | ||||
| 2, 6 | 2, 6 | ||||
| @@ -81,7 +81,7 @@ static const int h261_mtype_map[10]= { | |||||
| }; | }; | ||||
| //H.261 VLC table for motion vectors | //H.261 VLC table for motion vectors | ||||
| const uint8_t h261_mv_tab[17][2] = { | |||||
| static const uint8_t h261_mv_tab[17][2] = { | |||||
| {1,1}, {1,2}, {1,3}, {1,4}, {3,6}, {5,7}, {4,7}, {3,7}, | {1,1}, {1,2}, {1,3}, {1,4}, {3,6}, {5,7}, {4,7}, {3,7}, | ||||
| {11,9}, {10,9}, {9,9}, {17,10}, {16,10}, {15,10}, {14,10}, {13,10}, {12,10} | {11,9}, {10,9}, {9,9}, {17,10}, {16,10}, {15,10}, {14,10}, {13,10}, {12,10} | ||||
| }; | }; | ||||
| @@ -92,7 +92,7 @@ static const int mvmap[17] = | |||||
| }; | }; | ||||
| //H.261 VLC table for coded block pattern | //H.261 VLC table for coded block pattern | ||||
| const uint8_t h261_cbp_tab[63][2] = | |||||
| static const uint8_t h261_cbp_tab[63][2] = | |||||
| { | { | ||||
| {11,5}, {9,5}, {13,6}, {13,4}, {23,7}, {19,7}, {31,8}, {12,4}, | {11,5}, {9,5}, {13,6}, {13,4}, {23,7}, {19,7}, {31,8}, {12,4}, | ||||
| {22,7}, {18,7}, {30,8}, {19,5}, {27,8}, {23,8}, {19,8}, {11,4}, | {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] = | |||||
| }; | }; | ||||
| //H.261 VLC table for transform coefficients | //H.261 VLC table for transform coefficients | ||||
| const uint16_t h261_tcoeff_vlc[65][2] = { | |||||
| static const uint16_t h261_tcoeff_vlc[65][2] = { | |||||
| { 0x2, 2 }, { 0x3, 2 },{ 0x4, 4 },{ 0x5, 5 }, | { 0x2, 2 }, { 0x3, 2 },{ 0x4, 4 },{ 0x5, 5 }, | ||||
| { 0x6, 7 },{ 0x26, 8 },{ 0x21, 8 },{ 0xa, 10 }, | { 0x6, 7 },{ 0x26, 8 },{ 0x21, 8 },{ 0xa, 10 }, | ||||
| { 0x1d, 12 },{ 0x18, 12 },{ 0x13, 12 },{ 0x10 , 12 }, | { 0x1d, 12 },{ 0x18, 12 },{ 0x13, 12 },{ 0x10 , 12 }, | ||||
| @@ -125,7 +125,7 @@ const uint16_t h261_tcoeff_vlc[65][2] = { | |||||
| { 0x1, 6 } //escape | { 0x1, 6 } //escape | ||||
| }; | }; | ||||
| const int8_t h261_tcoeff_level[64] = { | |||||
| static const int8_t h261_tcoeff_level[64] = { | |||||
| 0, 1, 2, 3, 4, 5, 6, 7, | 0, 1, 2, 3, 4, 5, 6, 7, | ||||
| 8, 9, 10, 11, 12, 13, 14, 15, | 8, 9, 10, 11, 12, 13, 14, 15, | ||||
| 1, 2, 3, 4, 5, 6, 7, 1, | 1, 2, 3, 4, 5, 6, 7, 1, | ||||
| @@ -136,7 +136,7 @@ const int8_t h261_tcoeff_level[64] = { | |||||
| 1, 1, 1, 1, 1, 1, 1, 1 | 1, 1, 1, 1, 1, 1, 1, 1 | ||||
| }; | }; | ||||
| const int8_t h261_tcoeff_run[64] = { | |||||
| static const int8_t h261_tcoeff_run[64] = { | |||||
| 0, | 0, | ||||
| 0, 0, 0, 0, 0, 0, 0, 0, | 0, 0, 0, 0, 0, 0, 0, 0, | ||||
| 0, 0, 0, 0, 0, 0, 0, 1, | 0, 0, 0, 0, 0, 0, 0, 1, | ||||
| @@ -538,7 +538,7 @@ static void imc_adjust_bit_allocation (IMCContext* q, int summer) { | |||||
| } | } | ||||
| } | } | ||||
| void imc_imdct256(IMCContext *q) { | |||||
| static void imc_imdct256(IMCContext *q) { | |||||
| int i; | int i; | ||||
| float re, im; | float re, im; | ||||
| @@ -135,8 +135,8 @@ static int mp3len(void *data, int *samplesPerFrame, int *sampleRate) | |||||
| return *samplesPerFrame * bitRate / (bitsPerSlot * *sampleRate) + isPadded; | return *samplesPerFrame * bitRate / (bitsPerSlot * *sampleRate) + isPadded; | ||||
| } | } | ||||
| int MP3lame_encode_frame(AVCodecContext *avctx, | |||||
| unsigned char *frame, int buf_size, void *data) | |||||
| static int MP3lame_encode_frame(AVCodecContext *avctx, | |||||
| unsigned char *frame, int buf_size, void *data) | |||||
| { | { | ||||
| Mp3AudioContext *s = avctx->priv_data; | Mp3AudioContext *s = avctx->priv_data; | ||||
| int len; | int len; | ||||
| @@ -198,7 +198,7 @@ int MP3lame_encode_frame(AVCodecContext *avctx, | |||||
| return 0; | return 0; | ||||
| } | } | ||||
| int MP3lame_encode_close(AVCodecContext *avctx) | |||||
| static int MP3lame_encode_close(AVCodecContext *avctx) | |||||
| { | { | ||||
| Mp3AudioContext *s = avctx->priv_data; | Mp3AudioContext *s = avctx->priv_data; | ||||
| @@ -37,7 +37,7 @@ typedef struct PixelFormatTag { | |||||
| unsigned int fourcc; | unsigned int fourcc; | ||||
| } PixelFormatTag; | } PixelFormatTag; | ||||
| const PixelFormatTag pixelFormatTags[] = { | |||||
| static const PixelFormatTag pixelFormatTags[] = { | |||||
| { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ | { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ | ||||
| { PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') }, | { PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') }, | ||||
| { PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') }, | { PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') }, | ||||
| @@ -33,7 +33,7 @@ typedef struct VideoXLContext{ | |||||
| AVFrame pic; | AVFrame pic; | ||||
| } VideoXLContext; | } VideoXLContext; | ||||
| const int xl_table[32] = { | |||||
| static const int xl_table[32] = { | |||||
| 0, 1, 2, 3, 4, 5, 6, 7, | 0, 1, 2, 3, 4, 5, 6, 7, | ||||
| 8, 9, 12, 15, 20, 25, 34, 46, | 8, 9, 12, 15, 20, 25, 34, 46, | ||||
| 64, 82, 94, 103, 108, 113, 116, 119, | 64, 82, 94, 103, 108, 113, 116, 119, | ||||