diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2004-10-06 08:50:46 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2004-10-06 08:50:46 +0000 |
| commit | 7fea94ce4af2c97cbfc0a279fe7a755f9185f343 (patch) | |
| tree | 3a57473464a85cbe464d056ae5db963c17e19abd /libavcodec | |
| parent | a319bbac5c1b887894a4edea8bb0016161e239a2 (diff) | |
| download | ffmpeg-7fea94ce4af2c97cbfc0a279fe7a755f9185f343.tar.gz | |
* fixing a few of gcc 'clean-code' warnings
Originally committed as revision 3563 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/common.h | 6 | ||||
| -rw-r--r-- | libavcodec/indeo3.c | 3 | ||||
| -rw-r--r-- | libavcodec/ra144.c | 2 | ||||
| -rw-r--r-- | libavcodec/ra288.c | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/common.h b/libavcodec/common.h index 3ac8b4f82b..441d841d68 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -391,7 +391,7 @@ typedef struct RL_VLC_ELEM { /* used to avoid missaligned exceptions on some archs (alpha, ...) */ #ifdef ARCH_X86 -# define unaligned32(a) (*(uint32_t*)(a)) +# define unaligned32(a) (*(const uint32_t*)(a)) #else # ifdef __GNUC__ static inline uint32_t unaligned32(const void *v) { @@ -620,7 +620,7 @@ static inline int unaligned32_be(const void *v) (gb)->index= name##_index;\ # define UPDATE_CACHE(name, gb)\ - name##_cache= unaligned32_be( ((uint8_t *)(gb)->buffer)+(name##_index>>3) ) << (name##_index&0x07);\ + name##_cache= unaligned32_be( ((const uint8_t *)(gb)->buffer)+(name##_index>>3) ) << (name##_index&0x07);\ # define SKIP_CACHE(name, gb, num)\ name##_cache <<= (num);\ @@ -1253,7 +1253,7 @@ if((y)<(x)){\ #endif #ifdef ARCH_X86 -static inline long long rdtsc() +static inline long long rdtsc(void) { long long l; asm volatile( "rdtsc\n\t" diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index a27c3ba4f2..7e4cf01206 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -101,7 +101,8 @@ static void iv_Decode_Chunk(Indeo3DecodeContext *s, unsigned char *cur, static void iv_alloc_frames(Indeo3DecodeContext *s) { int luma_width, luma_height, luma_pixels, chroma_width, chroma_height, - chroma_pixels, bufsize, i; + chroma_pixels, i; + unsigned int bufsize; luma_width = (s->width + 3) & (~3); luma_height = (s->height + 3) & (~3); diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index 65829b6a33..79cce2cef6 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -130,7 +130,7 @@ static void do_voice(int *a1, int *a2) /* do quarter-block output */ -static void do_output_subblock(Real144_internal *glob, int x) +static void do_output_subblock(Real144_internal *glob, unsigned int x) { int a,b,c,d,e,f,g; diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index 09ecc7aacb..4cff3106e5 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -47,7 +47,7 @@ static void colmult(float *tgt, float *m1, const float *m2, int n); /* initial decode */ -static void unpack(unsigned short *tgt, unsigned char *src, int len) +static void unpack(unsigned short *tgt, unsigned char *src, unsigned int len) { int x,y,z; int n,temp; |