Browse Source

Change some leftover __attribute__((unused)) and __attribute__((used)) to

attribute_unused and attribute_used respectively to ease compiling on non-gcc.

Originally committed as revision 9024 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Reimar Döffinger 18 years ago
parent
commit
e36d79c837
5 changed files with 10 additions and 10 deletions
  1. +1
    -1
      libavcodec/4xm.c
  2. +1
    -1
      libavcodec/dvdata.h
  3. +4
    -4
      libavcodec/h264.c
  4. +2
    -2
      libavcodec/i386/dsputil_mmx_rnd.h
  5. +2
    -2
      libavcodec/svq3.c

+ 1
- 1
libavcodec/4xm.c View File

@@ -555,7 +555,7 @@ static int decode_i_frame(FourXContext *f, uint8_t *buf, int length){
uint16_t *dst= (uint16_t*)f->current_picture.data[0];
const int stride= f->current_picture.linesize[0]>>1;
const unsigned int bitstream_size= get32(buf);
const int token_count __attribute__((unused)) = get32(buf + bitstream_size + 8);
const int token_count attribute_unused = get32(buf + bitstream_size + 8);
unsigned int prestream_size= 4*get32(buf + bitstream_size + 4);
uint8_t *prestream= buf + bitstream_size + 12;



+ 1
- 1
libavcodec/dvdata.h View File

@@ -2534,7 +2534,7 @@ static const uint8_t dv_audio_shuffle625[12][9] = {
{ 31, 67, 103, 21, 57, 93, 11, 47, 83},
};

static const __attribute__((unused)) int dv_audio_frequency[3] = {
static const attribute_unused int dv_audio_frequency[3] = {
48000, 44100, 32000,
};



+ 4
- 4
libavcodec/h264.c View File

@@ -1800,7 +1800,7 @@ static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride
const int lt= src[-1-1*stride];
LOAD_TOP_EDGE
LOAD_LEFT_EDGE
const __attribute__((unused)) int unu= l3;
const attribute_unused int unu= l3;

src[0+0*stride]=
src[1+2*stride]=(lt + t0 + 1)>>1;
@@ -1823,7 +1823,7 @@ static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride
static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){
LOAD_TOP_EDGE
LOAD_TOP_RIGHT_EDGE
const __attribute__((unused)) int unu= t7;
const attribute_unused int unu= t7;

src[0+0*stride]=(t0 + t1 + 1)>>1;
src[1+0*stride]=
@@ -1868,7 +1868,7 @@ static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int strid
const int lt= src[-1-1*stride];
LOAD_TOP_EDGE
LOAD_LEFT_EDGE
const __attribute__((unused)) int unu= t3;
const attribute_unused int unu= t3;

src[0+0*stride]=
src[2+1*stride]=(lt + l0 + 1)>>1;
@@ -5655,7 +5655,7 @@ static inline int get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) {
return ctx + 4 * cat;
}

static const __attribute((used)) uint8_t last_coeff_flag_offset_8x8[63] = {
static const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = {
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,


+ 2
- 2
libavcodec/i386/dsputil_mmx_rnd.h View File

@@ -380,7 +380,7 @@ static void DEF(avg, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line
} while (--h);
}

static __attribute__((unused)) void DEF(avg, pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
static attribute_unused void DEF(avg, pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
{
MOVQ_BFE(mm6);
JUMPALIGN();
@@ -427,7 +427,7 @@ static void DEF(avg, pixels16_x2)(uint8_t *block, const uint8_t *pixels, int lin
} while (--h);
}

static __attribute__((unused)) void DEF(avg, pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
static attribute_unused void DEF(avg, pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
{
MOVQ_BFE(mm6);
JUMPALIGN();


+ 2
- 2
libavcodec/svq3.c View File

@@ -183,8 +183,8 @@ static void svq3_add_idct_c (uint8_t *dst, DCTELEM *block, int stride, int qp, i
static void pred4x4_down_left_svq3_c(uint8_t *src, uint8_t *topright, int stride){
LOAD_TOP_EDGE
LOAD_LEFT_EDGE
const __attribute__((unused)) int unu0= t0;
const __attribute__((unused)) int unu1= l0;
const attribute_unused int unu0= t0;
const attribute_unused int unu1= l0;

src[0+0*stride]=(l1 + t1)>>1;
src[1+0*stride]=


Loading…
Cancel
Save