Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -51,4 +51,4 @@ | |||||
| #endif | #endif | ||||
| #endif | |||||
| #endif // AVCODEC_ARM_MATHOPS_H | |||||
| @@ -137,4 +137,4 @@ static const float qmf_48tap_half[24] = { | |||||
| /* joint stereo related tables */ | /* joint stereo related tables */ | ||||
| static const float matrixCoeffs[8] = {0.0, 2.0, 2.0, 2.0, 0.0, 0.0, 1.0, 1.0}; | static const float matrixCoeffs[8] = {0.0, 2.0, 2.0, 2.0, 0.0, 0.0, 1.0, 1.0}; | ||||
| #endif | |||||
| #endif // AVCODEC_ATRAC3DATA_H | |||||
| @@ -12,4 +12,4 @@ enum BethsoftVidBlockType | |||||
| EOF_BLOCK = 0x14, | EOF_BLOCK = 0x14, | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_BETHSOFTVIDEO_H | |||||
| @@ -35,4 +35,4 @@ typedef enum { | |||||
| BMP_BITFIELDS =3, | BMP_BITFIELDS =3, | ||||
| } BiCompression; | } BiCompression; | ||||
| #endif | |||||
| #endif // AVCODEC_BMP_H | |||||
| @@ -518,4 +518,4 @@ static const int_fast8_t top_modifier_l[8] = {-1, 1, 5,-1,-1, 5, 7, 7}; | |||||
| static const int_fast8_t left_modifier_c[7] = { 5,-1, 2,-1, 6, 5, 6}; | static const int_fast8_t left_modifier_c[7] = { 5,-1, 2,-1, 6, 5, 6}; | ||||
| static const int_fast8_t top_modifier_c[7] = { 4, 1,-1,-1, 4, 6, 6}; | static const int_fast8_t top_modifier_c[7] = { 4, 1,-1,-1, 4, 6, 6}; | ||||
| #endif | |||||
| #endif // AVCODEC_CAVSDATA_H | |||||
| @@ -563,4 +563,4 @@ static const float* cplscales[5] = { | |||||
| cplscale2, cplscale3, cplscale4, cplscale5, cplscale6, | cplscale2, cplscale3, cplscale4, cplscale5, cplscale6, | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_COOKDATA_H | |||||
| @@ -31,4 +31,4 @@ | |||||
| #define DCA_MARKER_14B_BE 0x1FFFE800 | #define DCA_MARKER_14B_BE 0x1FFFE800 | ||||
| #define DCA_MARKER_14B_LE 0xFF1F00E8 | #define DCA_MARKER_14B_LE 0xFF1F00E8 | ||||
| #endif | |||||
| #endif // AVCODEC_DCA_H | |||||
| @@ -8471,4 +8471,4 @@ where Ch(n) represents the subband samples in the (n)th audio channel. | |||||
| */ | */ | ||||
| #endif | |||||
| #endif // AVCODEC_DCADATA_H | |||||
| @@ -1073,4 +1073,4 @@ static const uint8_t* bitalloc_bits[10][8] = { | |||||
| bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL } | bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL } | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_DCAHUFF_H | |||||
| @@ -110,4 +110,4 @@ static const uint8_t dnxhd_1238_run[62] = { | |||||
| 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 21, 17, 18, 19, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, | 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 21, 17, 18, 19, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_DNXHDDATA_H | |||||
| @@ -2729,4 +2729,4 @@ static inline int dv_write_ssyb_id(uint8_t syb_num, uint8_t fr, uint8_t* buf) | |||||
| return 3; | return 3; | ||||
| } | } | ||||
| #endif | |||||
| #endif // AVCODEC_DVDATA_H | |||||
| @@ -52,4 +52,4 @@ void ff_init_elbg(int *points, int dim, int numpoints, int *codebook, | |||||
| int numCB, int num_steps, int *closest_cb, | int numCB, int num_steps, int *closest_cb, | ||||
| AVRandomState *rand_state); | AVRandomState *rand_state); | ||||
| #endif | |||||
| #endif // AVCODEC_ELBG_H | |||||
| @@ -37,4 +37,4 @@ | |||||
| void ff_faandct(DCTELEM * data); | void ff_faandct(DCTELEM * data); | ||||
| void ff_faandct248(DCTELEM * data); | void ff_faandct248(DCTELEM * data); | ||||
| #endif | |||||
| #endif // AVCODEC_FAANDCT_H | |||||
| @@ -484,4 +484,4 @@ static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k, int limit | |||||
| set_ur_golomb_jpegls(pb, v, k, limit, esc_len); | set_ur_golomb_jpegls(pb, v, k, limit, esc_len); | ||||
| } | } | ||||
| #endif | |||||
| #endif // AVCODEC_GOLOMB_H | |||||
| @@ -48,4 +48,4 @@ typedef struct H261Context{ | |||||
| #define MB_TYPE_H261_FIL 0x800000 | #define MB_TYPE_H261_FIL 0x800000 | ||||
| #endif | |||||
| #endif AVCODEC_H261_H | |||||
| @@ -161,4 +161,4 @@ static RLTable h261_rl_tcoeff = { | |||||
| h261_tcoeff_level, | h261_tcoeff_level, | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_H261DATA_H | |||||
| @@ -26,4 +26,4 @@ | |||||
| int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); | int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); | ||||
| #endif | |||||
| #endif // AVCODEC_H263_PARSER_H | |||||
| @@ -311,4 +311,4 @@ const uint8_t ff_h263_loop_filter_strength[32]={ | |||||
| 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12 | 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12 | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_H263DATA_H | |||||
| @@ -1329,4 +1329,4 @@ static const int cabac_context_init_PB[3][460][2] = | |||||
| } | } | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_H264DATA_H | |||||
| @@ -42,4 +42,4 @@ | |||||
| asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb));\ | asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb));\ | ||||
| rt; }) | rt; }) | ||||
| #endif | |||||
| #endif // AVCODEC_X86_MATHOPS_H | |||||
| @@ -167,4 +167,4 @@ static const uint16_t imc_huffman_bits[4][4][18] = { | |||||
| } | } | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_IMCDATA_H | |||||
| @@ -138,4 +138,4 @@ static const uint8_t ir2_luma_table[256] = { | |||||
| 0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80 | 0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80 | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_INDEO2DATA_H | |||||
| @@ -2339,4 +2339,4 @@ static const uint32_t correctionhighorder[] = { | |||||
| 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 | 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_INDEO3DATA_H | |||||
| @@ -210,4 +210,4 @@ static const float mpc7_SCF[128] = { | |||||
| 0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789 | 0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789 | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_MPCDATA_H | |||||
| @@ -479,4 +479,4 @@ static const uint8_t svcd_scan_offset_placeholder[14]={ | |||||
| 0xff, 0xff, 0xff, | 0xff, 0xff, 0xff, | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_MPEG12DATA_H | |||||
| @@ -429,4 +429,4 @@ static const uint8_t mpeg4_dc_threshold[8]={ | |||||
| 99, 13, 15, 17, 19, 21, 23, 0 | 99, 13, 15, 17, 19, 21, 23, 0 | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_MPEG4DATA_H | |||||
| @@ -603,4 +603,4 @@ static const float ci_table[8] = { | |||||
| -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037, | -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037, | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_MPEGAUDIODECTAB_H | |||||
| @@ -115,4 +115,4 @@ static const float fixed_smr[SBLIMIT] = { | |||||
| static const unsigned char nb_scale_factors[4] = { 3, 2, 1, 2 }; | static const unsigned char nb_scale_factors[4] = { 3, 2, 1, 2 }; | ||||
| #endif | |||||
| #endif // AVCODEC_MPEGAUDIOTAB_H | |||||
| @@ -2020,4 +2020,4 @@ static const uint8_t wmv2_scantableB[64]={ | |||||
| 0x13, 0x32, 0x1B, 0x3A, 0x23, 0x2B, 0x33, 0x3B, | 0x13, 0x32, 0x1B, 0x3A, 0x23, 0x2B, 0x33, 0x3B, | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_MSMPEG4TAB_H | |||||
| @@ -35,4 +35,4 @@ | |||||
| __rt; }) | __rt; }) | ||||
| #endif | #endif | ||||
| #endif | |||||
| #endif // AVCODEC_PPC_MATHOPS_H | |||||
| @@ -43,4 +43,4 @@ | |||||
| #define zero_u32v (vec_u32_t) zerov | #define zero_u32v (vec_u32_t) zerov | ||||
| #define zero_s32v (vec_s32_t) zerov | #define zero_s32v (vec_s32_t) zerov | ||||
| #endif | |||||
| #endif // AVCODEC_TYPES_ALTIVEC_H | |||||
| @@ -139,4 +139,4 @@ static inline int get_rac(RangeCoder *c, uint8_t * const state){ | |||||
| #endif | #endif | ||||
| } | } | ||||
| #endif | |||||
| #endif // AVCODEC_RANGECODER_H | |||||
| @@ -70,4 +70,4 @@ void ff_apply_motion_4x4(RoqContext *ri, int x, int y, int deltax, int deltay); | |||||
| void ff_apply_motion_8x8(RoqContext *ri, int x, int y, int deltax, int deltay); | void ff_apply_motion_8x8(RoqContext *ri, int x, int y, int deltax, int deltay); | ||||
| #endif | |||||
| #endif // AVCODEC_ROQVIDEO_H | |||||
| @@ -43,4 +43,4 @@ void simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block); | |||||
| void simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block); | void simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block); | ||||
| void simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block); | void simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block); | ||||
| #endif | |||||
| #endif // AVCODEC_SIMPLE_IDCT_H | |||||
| @@ -329,4 +329,4 @@ static inline void vis_alignaddrl_g0(void *_ptr) | |||||
| #define vis_pdist(rs1,rs2,rd) vis_dd2d(0x3e, rs1, rs2, rd) | #define vis_pdist(rs1,rs2,rd) vis_dd2d(0x3e, rs1, rs2, rd) | ||||
| #endif | |||||
| #endif // AVCODEC_VIS_H | |||||
| @@ -1585,4 +1585,4 @@ static const int8_t svq1_intra_codebook_sum[4][16*6] = { | |||||
| } | } | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_SVQ1_CB_H | |||||
| @@ -4121,4 +4121,4 @@ static const unsigned char ulti_codebook[16384]={ | |||||
| 0x3D, 0x3E, 0x3E, 0x3F | 0x3D, 0x3E, 0x3E, 0x3F | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_ULTI_CB_H | |||||
| @@ -304,4 +304,4 @@ typedef struct VC1Context{ | |||||
| int bi_type; | int bi_type; | ||||
| } VC1Context; | } VC1Context; | ||||
| #endif | |||||
| #endif // AVCODEC_VC1_H | |||||
| @@ -589,4 +589,4 @@ static const uint8_t vc1_last_delta_run_table[AC_MODES][10] = { | |||||
| } | } | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_VC1ACDATA_H | |||||
| @@ -502,4 +502,4 @@ static const struct { | |||||
| { 3, 2, 3, (const int[]){ -1, 12, 13, 14 } }, | { 3, 2, 3, (const int[]){ -1, 12, 13, 14 } }, | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_VORBIS_ENC_DATA_H | |||||
| @@ -1438,4 +1438,4 @@ static const CoefVLCTable coef_vlcs[6] = { | |||||
| }, | }, | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVCODEC_WMADATA_H | |||||
| @@ -40,4 +40,4 @@ int ff_split_xiph_headers(uint8_t *extradata, int extradata_size, | |||||
| int first_header_size, uint8_t *header_start[3], | int first_header_size, uint8_t *header_start[3], | ||||
| int header_len[3]); | int header_len[3]); | ||||
| #endif | |||||
| #endif // AVCODEC_XIPH_H | |||||
| @@ -52,4 +52,4 @@ typedef struct{ | |||||
| } xvmc_render_state_t; | } xvmc_render_state_t; | ||||
| #endif | |||||
| #endif // AVCODEC_XVMC_RENDER_H | |||||
| @@ -286,4 +286,4 @@ static const GUID my_guid = { | |||||
| #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000 | #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000 | ||||
| #endif | |||||
| #endif // AVFORMAT_ASF_H | |||||
| @@ -41,4 +41,4 @@ DVMuxContext* dv_init_mux(AVFormatContext* s); | |||||
| int dv_assemble_frame(DVMuxContext *c, AVStream*, const uint8_t*, int, uint8_t**); | int dv_assemble_frame(DVMuxContext *c, AVStream*, const uint8_t*, int, uint8_t**); | ||||
| void dv_delete_mux(DVMuxContext*); | void dv_delete_mux(DVMuxContext*); | ||||
| #endif | |||||
| #endif // AVFORMAT_DV_H | |||||
| @@ -67,4 +67,4 @@ int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, | |||||
| const uint8_t *buf, int len); | const uint8_t *buf, int len); | ||||
| void mpegts_parse_close(MpegTSContext *ts); | void mpegts_parse_close(MpegTSContext *ts); | ||||
| #endif | |||||
| #endif AVFORMAT_MPEGTS_H | |||||
| @@ -99,4 +99,4 @@ static unsigned long av_crc04C11DB7_update(unsigned long checksum, const uint8_t | |||||
| return av_crc(av_crc04C11DB7, checksum, buf, len); | return av_crc(av_crc04C11DB7, checksum, buf, len); | ||||
| } | } | ||||
| #endif | |||||
| #endif AVFORMAT_NUT_H | |||||
| @@ -37,4 +37,4 @@ RTSP_STATUS_SERVICE =503, /**< Service Unavailable */ | |||||
| RTSP_STATUS_VERSION =505, /**< RTSP Version not supported */ | RTSP_STATUS_VERSION =505, /**< RTSP Version not supported */ | ||||
| }; | }; | ||||
| #endif | |||||
| #endif // AVFORMAT_RTSPCODES_H | |||||
| @@ -37,4 +37,4 @@ int av_base64_decode(uint8_t * out, const char *in, int out_length); | |||||
| */ | */ | ||||
| char *av_base64_encode(char * buf, int buf_len, uint8_t * src, int len); | char *av_base64_encode(char * buf, int buf_len, uint8_t * src, int len); | ||||
| #endif | |||||
| #endif // AVUTIL_BASE64_H | |||||
| @@ -126,4 +126,4 @@ static inline int av_sf2int(SoftFloat v, int frac_bits){ | |||||
| else return v.mant >>(-v.exp); | else return v.mant >>(-v.exp); | ||||
| } | } | ||||
| #endif | |||||
| #endif // AVUTIL_SOFTFLOAT_H | |||||
| @@ -185,4 +185,4 @@ static inline void linecpy(void *dest, void *src, int lines, int stride) | |||||
| } | } | ||||
| } | } | ||||
| #endif | |||||
| #endif // POSTPROCESS_INTERNAL_H | |||||