Revision 4cfbf61b

View differences:

libavcodec/cyuv.c
37 37
#include "avcodec.h"
38 38
#include "dsputil.h"
39 39
#include "mpegvideo.h"
40
#include "bswap.h"
41 40

  
42 41

  
43 42
typedef struct CyuvDecodeContext {
libavcodec/h264.c
1484 1484
    src[2+0*stride]=
1485 1485
    src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2;
1486 1486
    src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2;
1487
};
1487
}
1488 1488

  
1489 1489
static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){
1490 1490
    LOAD_TOP_EDGE    
......
1507 1507
    src[3+2*stride]=
1508 1508
    src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2;
1509 1509
    src[3+3*stride]=(t6 + 3*t7 + 2)>>2;
1510
};
1510
}
1511 1511

  
1512 1512
static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){
1513 1513
    const int lt= src[-1-1*stride];
......
1531 1531
    src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2;
1532 1532
    src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2;
1533 1533
    src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
1534
};
1534
}
1535 1535

  
1536 1536
static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){
1537 1537
    LOAD_TOP_EDGE    
......
1554 1554
    src[3+1*stride]=
1555 1555
    src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2;
1556 1556
    src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2;
1557
};
1557
}
1558 1558

  
1559 1559
static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){
1560 1560
    LOAD_LEFT_EDGE    
......
1575 1575
    src[2+2*stride]=
1576 1576
    src[2+3*stride]=
1577 1577
    src[3+3*stride]=l3;
1578
};
1578
}
1579 1579
    
1580 1580
static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){
1581 1581
    const int lt= src[-1-1*stride];
......
1599 1599
    src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
1600 1600
    src[0+3*stride]=(l2 + l3 + 1)>>1;
1601 1601
    src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2;
1602
};
1602
}
1603 1603

  
1604 1604
static void pred16x16_vertical_c(uint8_t *src, int stride){
1605 1605
    int i;
libavcodec/huffyuv.c
1097 1097
        char *p= avctx->stats_out;
1098 1098
        for(i=0; i<3; i++){
1099 1099
            for(j=0; j<256; j++){
1100
                sprintf(p, "%Ld ", s->stats[i][j]);
1100
                sprintf(p, "%llu ", s->stats[i][j]);
1101 1101
                p+= strlen(p);
1102 1102
                s->stats[i][j]= 0;
1103 1103
            }
libavcodec/imgconvert.c
747 747
 cm[(((y) - 128) * FIX(127.0/112.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS]
748 748

  
749 749
/* NOTE: the clamp is really necessary! */
750
#define C_JPEG_TO_CCIR(y)\
751
({\
752
    int __y;\
753
    __y = ((((y) - 128) * FIX(112.0/127.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS);\
754
    if (__y < 16)\
755
         __y = 16;\
756
    __y;\
757
})
750
static inline int C_JPEG_TO_CCIR(int y) {
751
    y = (((y - 128) * FIX(112.0/127.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS);
752
    if (y < 16)
753
	y = 16;
754
    return y;
755
}
756

  
758 757

  
759 758
#define RGB_TO_Y(r, g, b) \
760 759
((FIX(0.29900) * (r) + FIX(0.58700) * (g) + \
......
1608 1607
    void *ptr;
1609 1608

  
1610 1609
    size = avpicture_get_size(pix_fmt, width, height);
1611
    if (size < 0)
1612
        goto fail;
1613 1610
    ptr = av_malloc(size);
1614 1611
    if (!ptr)
1615 1612
        goto fail;
libavcodec/indeo3.c
26 26
#include "avcodec.h"
27 27
#include "dsputil.h"
28 28
#include "mpegvideo.h"
29
#include "bswap.h"
30 29

  
31 30
#include "indeo3data.h"
32 31

  
libavcodec/libpostproc/postprocess.c
765 765
	reallocAlign((void **)&c->forcedQPTable, 8, mbWidth*sizeof(QP_STORE_T));
766 766
}
767 767

  
768
static void global_init(){
768
static void global_init(void){
769 769
	int i;
770 770
	memset(clip_table, 0, 256);
771 771
	for(i=256; i<512; i++)
libavcodec/svq1.c
37 37
#include "avcodec.h"
38 38
#include "dsputil.h"
39 39
#include "mpegvideo.h"
40
#include "bswap.h"
41 40
#define bit_buffer_t GetBitContext
42 41

  
43 42
static inline unsigned int get_bit_cache(GetBitContext *s){
libavcodec/svq3.c
199 199
    src[3+2*stride]=
200 200
    src[2+3*stride]=
201 201
    src[3+3*stride]=(l3 + t3)>>1;
202
};
202
}
203 203

  
204 204
static void pred16x16_plane_svq3_c(uint8_t *src, int stride){
205 205
    pred16x16_plane_compat_c(src, stride, 1);
libavcodec/utils.c
84 84
    return ptr;
85 85
}
86 86
/* free all static arrays and reset pointers to 0 */
87
void av_free_static()
87
void av_free_static(void)
88 88
{
89 89
    if (array_static)
90 90
    {
libavcodec/vp3.c
35 35
#include "dsputil.h"
36 36
#include "mpegvideo.h"
37 37
#include "dsputil.h"
38
#include "bswap.h"
39 38

  
40 39
#include "vp3data.h"
41 40

  
libavformat/asf.c
993 993
    int c = get_byte(pb);
994 994
    if (c != 0x82) {
995 995
        if (!url_feof(pb))
996
	    printf("ff asf bad header %x  at:%Ld\n", c, url_ftell(pb));
996
	    printf("ff asf bad header %x  at:%lld\n", c, url_ftell(pb));
997 997
	return -EIO;
998 998
    }
999 999
    if ((c & 0x0f) == 2) { // always true for now
......
1220 1220

  
1221 1221
static int asf_read_seek(AVFormatContext *s, int64_t pts)
1222 1222
{
1223
    printf("SEEK TO %Ld", pts);
1223
    printf("SEEK TO %lld", pts);
1224 1224
    return -1;
1225 1225
}
1226 1226

  
libavformat/mov.c
1369 1369
    /* check MOV header */
1370 1370
    err = mov_read_default(mov, pb, atom);
1371 1371
    if (err<0 || (!mov->found_moov && !mov->found_mdat)) {
1372
	fprintf(stderr, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%Ld\n",
1372
	fprintf(stderr, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%lld\n",
1373 1373
		err, mov->found_moov, mov->found_mdat, url_ftell(pb));
1374 1374
	return -1;
1375 1375
    }

Also available in: Unified diff