diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-02-10 09:35:32 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-02-10 09:35:32 +0000 |
| commit | 5c91a6755b6412c918e20ff4735ca30f38a12569 (patch) | |
| tree | 054521cdfc6d752e89883ef3fcfc05d6c31fd94c /libavcodec/imgconvert.c | |
| parent | cd66005ddaebba2d6cb3b4eae75f70ae2446b204 (diff) | |
| download | ffmpeg-5c91a6755b6412c918e20ff4735ca30f38a12569.tar.gz | |
* static,const,compiler warning cleanup
Originally committed as revision 1567 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 4c9722fa33..6f9e511449 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -739,7 +739,7 @@ static inline unsigned int bitcopy_n(unsigned int a, int n) #define RGB_IN(r, g, b, s)\ {\ - unsigned int v = ((UINT16 *)(s))[0];\ + unsigned int v = ((const UINT16 *)(s))[0];\ r = bitcopy_n(v >> (10 - 3), 3);\ g = bitcopy_n(v >> (5 - 3), 3);\ b = bitcopy_n(v << 3, 3);\ @@ -762,7 +762,7 @@ RGB_FUNCTIONS(rgb555) #define RGB_IN(r, g, b, s)\ {\ - unsigned int v = ((UINT16 *)(s))[0];\ + unsigned int v = ((const UINT16 *)(s))[0];\ r = bitcopy_n(v >> (11 - 3), 3);\ g = bitcopy_n(v >> (5 - 2), 2);\ b = bitcopy_n(v << 3, 3);\ @@ -833,7 +833,7 @@ RGB_FUNCTIONS(rgb24) #define RGB_IN(r, g, b, s)\ {\ - unsigned int v = ((UINT32 *)(s))[0];\ + unsigned int v = ((const UINT32 *)(s))[0];\ r = (v >> 16) & 0xff;\ g = (v >> 8) & 0xff;\ b = v & 0xff;\ @@ -1229,7 +1229,7 @@ static ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { static int avpicture_alloc(AVPicture *picture, int pix_fmt, int width, int height) { - int size; + unsigned int size; void *ptr; size = avpicture_get_size(pix_fmt, width, height); |