Revision 191e8ca7 libavcodec/vc1.c

View differences:

libavcodec/vc1.c
2341 2341
 * @param dir_ptr Prediction direction for use in AC prediction
2342 2342
 */
2343 2343
static inline int vc1_i_pred_dc(MpegEncContext *s, int overlap, int pq, int n,
2344
                              int16_t **dc_val_ptr, int *dir_ptr)
2344
                                uint16_t **dc_val_ptr, int *dir_ptr)
2345 2345
{
2346 2346
    int a, b, c, wrap, pred, scale;
2347
    int16_t *dc_val;
2347
    uint16_t *dc_val;
2348 2348
    static const uint16_t dcpred[32] = {
2349 2349
    -1, 1024,  512,  341,  256,  205,  171,  146,  128,
2350 2350
         114,  102,   93,   85,   79,   73,   68,   64,
......
2402 2402
 */
2403 2403
static inline int vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n,
2404 2404
                              int a_avail, int c_avail,
2405
                              int16_t **dc_val_ptr, int *dir_ptr)
2405
                              uint16_t **dc_val_ptr, int *dir_ptr)
2406 2406
{
2407 2407
    int a, b, c, wrap, pred, scale;
2408
    int16_t *dc_val;
2408
    uint16_t *dc_val;
2409 2409
    int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
2410 2410
    int q1, q2 = 0;
2411 2411

  
......
2578 2578
    MpegEncContext *s = &v->s;
2579 2579
    int dc_pred_dir = 0; /* Direction of the DC prediction used */
2580 2580
    int run_diff, i;
2581
    int16_t *dc_val;
2581
    uint16_t *dc_val;
2582 2582
    int16_t *ac_val, *ac_val2;
2583 2583
    int dcdiff;
2584 2584

  
......
2743 2743
    MpegEncContext *s = &v->s;
2744 2744
    int dc_pred_dir = 0; /* Direction of the DC prediction used */
2745 2745
    int run_diff, i;
2746
    int16_t *dc_val;
2746
    uint16_t *dc_val;
2747 2747
    int16_t *ac_val, *ac_val2;
2748 2748
    int dcdiff;
2749 2749
    int a_avail = v->a_avail, c_avail = v->c_avail;
......
2940 2940
    MpegEncContext *s = &v->s;
2941 2941
    int dc_pred_dir = 0; /* Direction of the DC prediction used */
2942 2942
    int run_diff, i;
2943
    int16_t *dc_val;
2943
    uint16_t *dc_val;
2944 2944
    int16_t *ac_val, *ac_val2;
2945 2945
    int dcdiff;
2946 2946
    int mb_pos = s->mb_x + s->mb_y * s->mb_stride;

Also available in: Unified diff