Revision e4de5b0f

View differences:

libavcodec/zmbvenc.c
61 61
 * XXX should be optimized and moved to DSPContext
62 62
 * TODO handle out of edge ME
63 63
 */
64
static inline int block_cmp(uint8_t *src, int stride, uint8_t *src2, int stride2, int bw, int bh, int *xored)
64
static inline int block_cmp(uint8_t *src, int stride, uint8_t *src2, int stride2,
65
                            int bw, int bh, int *xored)
65 66
{
66 67
    int sum = 0;
67 68
    int i, j;
68
    uint8_t histogram[256]={0};
69
    uint8_t histogram[256] = {0};
69 70

  
70 71
    *xored = 0;
71 72
    for(j = 0; j < bh; j++){
......
78 79
        src2 += stride2;
79 80
    }
80 81

  
81
    for(i=1; i<256; i++)
82
        sum+= score_tab[histogram[i]];
82
    for(i = 1; i < 256; i++)
83
        sum += score_tab[histogram[i]];
83 84

  
84 85
    return sum;
85 86
}
......
87 88
/** Motion estimation function
88 89
 * TODO make better ME decisions
89 90
 */
90
static int zmbv_me(ZmbvEncContext *c, uint8_t *src, int sstride, uint8_t *prev, int pstride,
91
                    int x, int y, int *mx, int *my, int *xored)
91
static int zmbv_me(ZmbvEncContext *c, uint8_t *src, int sstride, uint8_t *prev,
92
                   int pstride, int x, int y, int *mx, int *my, int *xored)
92 93
{
93 94
    int dx, dy, tx, ty, tv, bv, bw, bh;
94 95

  

Also available in: Unified diff