# HG changeset patch # User diego # Date 1248785432 0 # Node ID 7b2e5c91104ed909b5a10d853a84fe7f528adef7 # Parent c50957bfd5532101558fb34254d33309f0db8e05 Use dprintf() instead of '#ifdef DEBUG' and av_log(). diff -r c50957bfd553 -r 7b2e5c91104e rv10.c --- a/rv10.c Mon Jul 27 22:55:55 2009 +0000 +++ b/rv10.c Tue Jul 28 12:50:32 2009 +0000 @@ -307,9 +307,7 @@ if(!marker) av_log(s->avctx, AV_LOG_ERROR, "marker missing\n"); pb_frame = get_bits1(&s->gb); -#ifdef DEBUG - av_log(s->avctx, AV_LOG_DEBUG, "pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame); -#endif + dprintf(s->avctx, "pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame); if (pb_frame){ av_log(s->avctx, AV_LOG_ERROR, "pb frame not supported\n"); @@ -328,12 +326,8 @@ s->last_dc[0] = get_bits(&s->gb, 8); s->last_dc[1] = get_bits(&s->gb, 8); s->last_dc[2] = get_bits(&s->gb, 8); -#ifdef DEBUG - av_log(s->avctx, AV_LOG_DEBUG, "DC:%d %d %d\n", - s->last_dc[0], - s->last_dc[1], - s->last_dc[2]); -#endif + dprintf(s->avctx, "DC:%d %d %d\n", s->last_dc[0], + s->last_dc[1], s->last_dc[2]); } } /* if multiple packets per frame are sent, the position at which @@ -630,9 +624,7 @@ ff_er_frame_start(s); } -#ifdef DEBUG - av_log(avctx, AV_LOG_DEBUG, "qscale=%d\n", s->qscale); -#endif + dprintf(avctx, "qscale=%d\n", s->qscale); /* default quantization values */ if(s->codec_id== CODEC_ID_RV10){ @@ -672,9 +664,7 @@ for(s->mb_num_left= mb_count; s->mb_num_left>0; s->mb_num_left--) { int ret; ff_update_block_index(s); -#ifdef DEBUG - av_log(avctx, AV_LOG_DEBUG, "**mb x=%d y=%d\n", s->mb_x, s->mb_y); -#endif + dprintf(avctx, "**mb x=%d y=%d\n", s->mb_x, s->mb_y); s->mv_dir = MV_DIR_FORWARD; s->mv_type = MV_TYPE_16X16; @@ -723,9 +713,7 @@ int slice_count; const uint8_t *slices_hdr = NULL; -#ifdef DEBUG - av_log(avctx, AV_LOG_DEBUG, "*****frame %d size=%d\n", avctx->frame_number, buf_size); -#endif + dprintf(avctx, "*****frame %d size=%d\n", avctx->frame_number, buf_size); /* no supplementary picture */ if (buf_size == 0) {