@@ -418,8 +418,8 @@ int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile)

                         break;

                     pos = band->scan[scan_pos];

-                    if (IVI_DEBUG && !val)

-                        av_log(NULL, AV_LOG_ERROR, "Val = 0 encountered!\n");

+                    if (!val)

+                        av_dlog(NULL, "Val = 0 encountered!\n");

                     q = (base_tab[pos] * quant) >> 9;

                     if (q > 1)

@@ -238,9 +238,9 @@ static int svq1_decode_block_intra (GetBitContext *bitbuf, uint8_t *pixels, int

     }

     if ((stages > 0) && (level >= 4)) {

-#ifdef DEBUG_SVQ1

-    av_log(s->avctx, AV_LOG_INFO, "Error (svq1_decode_block_intra): invalid vector: stages=%i level=%i\n",stages,level);

-#endif

+      av_dlog(s->avctx,

+              "Error (svq1_decode_block_intra): invalid vector: stages=%i level=%i\n",

+              stages, level);

       return -1;        /* invalid vector */

     }

@@ -288,9 +288,9 @@ static int svq1_decode_block_non_intra (GetBitContext *bitbuf, uint8_t *pixels,

     if (stages == -1) continue; /* skip vector */

     if ((stages > 0) && (level >= 4)) {

-#ifdef DEBUG_SVQ1

-    av_log(s->avctx, AV_LOG_INFO, "Error (svq1_decode_block_non_intra): invalid vector: stages=%i level=%i\n",stages,level);

-#endif

+      av_dlog(s->avctx,

+              "Error (svq1_decode_block_non_intra): invalid vector: stages=%i level=%i\n",

+              stages, level);

       return -1;        /* invalid vector */

     }

@@ -499,9 +499,7 @@ static int svq1_decode_delta_block (MpegEncContext *s, GetBitContext *bitbuf,

     if (result != 0)

     {

-#ifdef DEBUG_SVQ1

-    av_log(s->avctx, AV_LOG_INFO, "Error in svq1_motion_inter_block %i\n",result);

-#endif

+      av_dlog(s->avctx, "Error in svq1_motion_inter_block %i\n", result);

       break;

     }

     result = svq1_decode_block_non_intra (bitbuf, current, pitch);

@@ -512,9 +510,7 @@ static int svq1_decode_delta_block (MpegEncContext *s, GetBitContext *bitbuf,

     if (result != 0)

     {

-#ifdef DEBUG_SVQ1

-    av_log(s->avctx, AV_LOG_INFO, "Error in svq1_motion_inter_4v_block %i\n",result);

-#endif

+      av_dlog(s->avctx, "Error in svq1_motion_inter_4v_block %i\n", result);

       break;

     }

     result = svq1_decode_block_non_intra (bitbuf, current, pitch);

@@ -660,9 +656,7 @@ static int svq1_decode_frame(AVCodecContext *avctx,

   if (result != 0)

   {

-#ifdef DEBUG_SVQ1

-    av_log(s->avctx, AV_LOG_INFO, "Error in svq1_decode_frame_header %i\n",result);

-#endif

+    av_dlog(s->avctx, "Error in svq1_decode_frame_header %i\n",result);

     return result;

   }

@@ -729,9 +723,7 @@ static int svq1_decode_frame(AVCodecContext *avctx,

                                             linesize, pmv, x, y);

           if (result != 0)

           {

-#ifdef DEBUG_SVQ1

-    av_log(s->avctx, AV_LOG_INFO, "Error in svq1_decode_delta_block %i\n",result);

-#endif

+            av_dlog(s->avctx, "Error in svq1_decode_delta_block %i\n",result);

             goto err;

           }

         }

@@ -370,9 +370,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc)

                     float last = 0.0;

                     unsigned lookup_offset = i;

-#ifdef V_DEBUG

-                    av_log(vc->avccontext, AV_LOG_INFO, "Lookup offset %u ,", i);

-#endif

+                    av_dlog(vc->avccontext, "Lookup offset %u ,", i);

                     for (k = 0; k < dim; ++k) {

                         unsigned multiplicand_offset = lookup_offset % codebook_lookup_values;

@@ -383,12 +381,11 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc)

                     }

                     tmp_vlc_bits[j] = tmp_vlc_bits[i];

-#ifdef V_DEBUG

-                    av_log(vc->avccontext, AV_LOG_INFO, "real lookup offset %u, vector: ", j);

+                    av_dlog(vc->avccontext, "real lookup offset %u, vector: ", j);

                     for (k = 0; k < dim; ++k)

-                        av_log(vc->avccontext, AV_LOG_INFO, " %f ", codebook_setup->codevectors[j * dim + k]);

-                    av_log(vc->avccontext, AV_LOG_INFO, "\n");

-#endif

+                        av_dlog(vc->avccontext, " %f ",

+                                codebook_setup->codevectors[j * dim + k]);

+                    av_dlog(vc->avccontext, "\n");

                     ++j;

                 }

@@ -177,15 +177,13 @@ restart_poll:

             av_log(context, AV_LOG_ERROR, "Failed to get status: %s\n", strerror(errno));

             return AVERROR(EIO);

         }

-#ifdef DV1394_DEBUG

-        av_log(context, AV_LOG_DEBUG, "DV1394: status\n"

+        av_dlog(context, "DV1394: status\n"

                 "\tactive_frame\t%d\n"

                 "\tfirst_clear_frame\t%d\n"

                 "\tn_clear_frames\t%d\n"

                 "\tdropped_frames\t%d\n",

                 s.active_frame, s.first_clear_frame,

                 s.n_clear_frames, s.dropped_frames);

-#endif

         dv->avail = s.n_clear_frames;

         dv->index = s.first_clear_frame;

@@ -200,10 +198,8 @@ restart_poll:

         }

     }

-#ifdef DV1394_DEBUG

-    av_log(context, AV_LOG_DEBUG, "index %d, avail %d, done %d\n", dv->index, dv->avail,

+    av_dlog(context, "index %d, avail %d, done %d\n", dv->index, dv->avail,

             dv->done);

-#endif

     size = dv_produce_packet(dv->dv_demux, pkt,

                              dv->ring + (dv->index * DV1394_PAL_FRAME_SIZE),