Mercurial > libavcodec.hg
changeset 1282:8988af3ae1e8 libavcodec
Warning and compatibility fixes.
| author | mellum |
|---|---|
| date | Sat, 24 May 2003 18:48:30 +0000 |
| parents | 37176fafe11e |
| children | 00dcdda701ca |
| files | cyuv.c h264.c huffyuv.c imgconvert.c indeo3.c libpostproc/postprocess.c svq1.c svq3.c utils.c vp3.c |
| diffstat | 10 files changed, 17 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/cyuv.c Fri May 23 18:04:34 2003 +0000 +++ b/cyuv.c Sat May 24 18:48:30 2003 +0000 @@ -37,7 +37,6 @@ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" -#include "bswap.h" typedef struct CyuvDecodeContext {
--- a/h264.c Fri May 23 18:04:34 2003 +0000 +++ b/h264.c Sat May 24 18:48:30 2003 +0000 @@ -1484,7 +1484,7 @@ src[2+0*stride]= src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; -}; +} static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ LOAD_TOP_EDGE @@ -1507,7 +1507,7 @@ src[3+2*stride]= src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; src[3+3*stride]=(t6 + 3*t7 + 2)>>2; -}; +} static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ const int lt= src[-1-1*stride]; @@ -1531,7 +1531,7 @@ src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; -}; +} static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ LOAD_TOP_EDGE @@ -1554,7 +1554,7 @@ src[3+1*stride]= src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; -}; +} static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ LOAD_LEFT_EDGE @@ -1575,7 +1575,7 @@ src[2+2*stride]= src[2+3*stride]= src[3+3*stride]=l3; -}; +} static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ const int lt= src[-1-1*stride]; @@ -1599,7 +1599,7 @@ src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; src[0+3*stride]=(l2 + l3 + 1)>>1; src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; -}; +} static void pred16x16_vertical_c(uint8_t *src, int stride){ int i;
--- a/huffyuv.c Fri May 23 18:04:34 2003 +0000 +++ b/huffyuv.c Sat May 24 18:48:30 2003 +0000 @@ -1097,7 +1097,7 @@ char *p= avctx->stats_out; for(i=0; i<3; i++){ for(j=0; j<256; j++){ - sprintf(p, "%Ld ", s->stats[i][j]); + sprintf(p, "%llu ", s->stats[i][j]); p+= strlen(p); s->stats[i][j]= 0; }
--- a/imgconvert.c Fri May 23 18:04:34 2003 +0000 +++ b/imgconvert.c Sat May 24 18:48:30 2003 +0000 @@ -747,14 +747,13 @@ cm[(((y) - 128) * FIX(127.0/112.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS] /* NOTE: the clamp is really necessary! */ -#define C_JPEG_TO_CCIR(y)\ -({\ - int __y;\ - __y = ((((y) - 128) * FIX(112.0/127.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS);\ - if (__y < 16)\ - __y = 16;\ - __y;\ -}) +static inline int C_JPEG_TO_CCIR(int y) { + y = (((y - 128) * FIX(112.0/127.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS); + if (y < 16) + y = 16; + return y; +} + #define RGB_TO_Y(r, g, b) \ ((FIX(0.29900) * (r) + FIX(0.58700) * (g) + \ @@ -1608,8 +1607,6 @@ void *ptr; size = avpicture_get_size(pix_fmt, width, height); - if (size < 0) - goto fail; ptr = av_malloc(size); if (!ptr) goto fail;
--- a/indeo3.c Fri May 23 18:04:34 2003 +0000 +++ b/indeo3.c Sat May 24 18:48:30 2003 +0000 @@ -26,7 +26,6 @@ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" -#include "bswap.h" #include "indeo3data.h"
--- a/libpostproc/postprocess.c Fri May 23 18:04:34 2003 +0000 +++ b/libpostproc/postprocess.c Sat May 24 18:48:30 2003 +0000 @@ -765,7 +765,7 @@ reallocAlign((void **)&c->forcedQPTable, 8, mbWidth*sizeof(QP_STORE_T)); } -static void global_init(){ +static void global_init(void){ int i; memset(clip_table, 0, 256); for(i=256; i<512; i++)
--- a/svq1.c Fri May 23 18:04:34 2003 +0000 +++ b/svq1.c Sat May 24 18:48:30 2003 +0000 @@ -37,7 +37,6 @@ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" -#include "bswap.h" #define bit_buffer_t GetBitContext static inline unsigned int get_bit_cache(GetBitContext *s){
--- a/svq3.c Fri May 23 18:04:34 2003 +0000 +++ b/svq3.c Sat May 24 18:48:30 2003 +0000 @@ -199,7 +199,7 @@ src[3+2*stride]= src[2+3*stride]= src[3+3*stride]=(l3 + t3)>>1; -}; +} static void pred16x16_plane_svq3_c(uint8_t *src, int stride){ pred16x16_plane_compat_c(src, stride, 1);