comparison h263.c @ 523:c7e4c8b9a3c4 libavcodec

warning fix patch by atmos

522:cf7d120ed51a

#include "mpeg4data.h"

//rounded divison & shift
#define RSHIFT(a,b) ((a) > 0 ? ((a) + (1<<((b)-1)))>>(b) : ((a) + (1<<((b)-1))-1)>>(b))

#define PRINT_MB_TYPE(a) ;
//#define PRINT_MB_TYPE(a) printf(a);

static void h263_encode_block(MpegEncContext * s, DCTELEM * block,
			      int n);
static void h263_encode_motion(MpegEncContext * s, int val, int fcode);
static void h263p_encode_umotion(MpegEncContext * s, int val);

{
    int cbpc, cbpy, i, cbp, pred_x, pred_y, mx, my, dquant;
    INT16 *mot_val;
    static INT8 quant_tab[4] = { -1, -2, 1, 2 };

    if(s->mb_x==0) PRINT_MB_TYPE("\n")

    if(s->resync_marker){
        if(s->resync_mb_x == s->mb_x && s->resync_mb_y+1 == s->mb_y){
            s->first_slice_line=0; 
        }

            s->mv[1][0][0] = 0;
            s->mv[1][0][1] = 0;
//FIXME is this correct?
/*            s->last_mv[0][0][0]=
            s->last_mv[0][0][1]=0;*/
            PRINT_MB_TYPE("s")
            return 0;
        }

        modb1= get_bits1(&s->gb);
        if(modb1==0){

523:c7e4c8b9a3c4

#include "mpeg4data.h"

//rounded divison & shift
#define RSHIFT(a,b) ((a) > 0 ? ((a) + (1<<((b)-1)))>>(b) : ((a) + (1<<((b)-1))-1)>>(b))

#define PRINT_MB_TYPE(a) {}
//#define PRINT_MB_TYPE(a) printf(a)

static void h263_encode_block(MpegEncContext * s, DCTELEM * block,
			      int n);
static void h263_encode_motion(MpegEncContext * s, int val, int fcode);
static void h263p_encode_umotion(MpegEncContext * s, int val);

{
    int cbpc, cbpy, i, cbp, pred_x, pred_y, mx, my, dquant;
    INT16 *mot_val;
    static INT8 quant_tab[4] = { -1, -2, 1, 2 };

    if(s->mb_x==0) PRINT_MB_TYPE("\n");

    if(s->resync_marker){
        if(s->resync_mb_x == s->mb_x && s->resync_mb_y+1 == s->mb_y){
            s->first_slice_line=0; 
        }

            s->mv[1][0][0] = 0;
            s->mv[1][0][1] = 0;
//FIXME is this correct?
/*            s->last_mv[0][0][0]=
            s->last_mv[0][0][1]=0;*/
            PRINT_MB_TYPE("s");
            return 0;
        }

        modb1= get_bits1(&s->gb);
        if(modb1==0){