@@ -1760,7 +1760,7 @@ static int http_parse_request(HTTPContext *c)

                 }

             }

-#ifdef DEBUG_WMP

+#ifdef DEBUG

             http_log("\nGot request:\n%s\n", c->buffer);

 #endif

@@ -1790,7 +1790,7 @@ static int http_parse_request(HTTPContext *c)

         return 0;

     }

-#ifdef DEBUG_WMP

+#ifdef DEBUG

     if (strcmp(stream->filename + strlen(stream->filename) - 4, ".asf") == 0)

         http_log("\nGot request:\n%s\n", c->buffer);

 #endif

@@ -66,7 +66,6 @@

 #define SUBBAND_SIZE    20

 #define MAX_SUBPACKETS   5

-//#define COOKDEBUG

 typedef struct {

     int *now;

@@ -1005,7 +1004,7 @@ static int cook_decode_frame(AVCodecContext *avctx,

     return avctx->block_align;

 }

-#ifdef COOKDEBUG

+#ifdef DEBUG

 static void dump_cook_context(COOKContext *q)

 {

     //int i=0;

@@ -1247,7 +1246,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)

     else

         avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;

-#ifdef COOKDEBUG

+#ifdef DEBUG

     dump_cook_context(q);

 #endif

     return 0;

@@ -629,7 +629,7 @@ static int decode_band(IVI5DecContext *ctx, int plane_num,

         FFSWAP(int16_t, band->rv_map->valtab[idx1], band->rv_map->valtab[idx2]);

     }

-#if IVI_DEBUG

+#ifdef DEBUG

     if (band->checksum_present) {

         uint16_t chksum = ivi_calc_band_checksum(band);

         if (chksum != band->checksum) {

@@ -563,7 +563,7 @@ void ff_ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,

 }

-#if IVI_DEBUG

+#ifdef DEBUG

 uint16_t ivi_calc_band_checksum (IVIBandDesc *band)

 {

     int         x, y;

@@ -33,8 +33,6 @@

 #include "get_bits.h"

 #include <stdint.h>

-#define IVI_DEBUG 0

-

 #define IVI_VLC_BITS 13 ///< max number of bits of the ivi's huffman codes

 /**

@@ -33,7 +33,6 @@

  */

-//#define DEBUG_SVQ1

 #include "avcodec.h"

 #include "dsputil.h"

 #include "mpegvideo.h"

@@ -705,9 +704,7 @@ static int svq1_decode_frame(AVCodecContext *avctx,

           result = svq1_decode_block_intra (&s->gb, &current[x], linesize);

           if (result != 0)

           {

-//#ifdef DEBUG_SVQ1

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

-//#endif

             goto err;

           }

         }

@@ -20,9 +20,6 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

-#undef V_DEBUG

-//#define V_DEBUG

-

 #define ALT_BITSTREAM_READER_LE

 #include "avcodec.h"

 #include "get_bits.h"

@@ -57,7 +54,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)

     unsigned i, j, p, code;

-#ifdef V_DEBUG

+#ifdef DEBUG

     GetBitContext gb;

 #endif

@@ -74,7 +71,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)

     for (i = 0; i < bits[p]; ++i)

         exit_at_level[i+1] = 1 << i;

-#ifdef V_DEBUG

+#ifdef DEBUG

     av_log(NULL, AV_LOG_INFO, " %u. of %u code len %d code %d - ", p, num, bits[p], codes[p]);

     init_get_bits(&gb, (uint8_t *)&codes[p], bits[p]);

     for (i = 0; i < bits[p]; ++i)

@@ -102,7 +99,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)

             exit_at_level[j] = code + (1 << (j - 1));

         codes[p] = code;

-#ifdef V_DEBUG

+#ifdef DEBUG

         av_log(NULL, AV_LOG_INFO, " %d. code len %d code %d - ", p, bits[p], codes[p]);

         init_get_bits(&gb, (uint8_t *)&codes[p], bits[p]);

         for (i = 0; i < bits[p]; ++i)

@@ -33,9 +33,6 @@

 #include "libavutil/log.h"

 #include "libavutil/opt.h"

 #include "libavformat/avformat.h"

-

-#undef DV1394_DEBUG

-

 #include "libavformat/dv.h"

 #include "dv1394.h"

@@ -26,8 +26,6 @@

 #include <windows.h>

 #include <vfw.h>

-//#define DEBUG_VFW

-

 /* Defines for VFW missing from MinGW.

  * Remove this when MinGW incorporates them. */

 #define HWND_MESSAGE                ((HWND)-3)

@@ -122,7 +120,7 @@ static void dump_captureparms(AVFormatContext *s, CAPTUREPARMS *cparms)

 static void dump_videohdr(AVFormatContext *s, VIDEOHDR *vhdr)

 {

-#ifdef DEBUG_VFW

+#ifdef DEBUG

     av_log(s, AV_LOG_DEBUG, "VIDEOHDR\n");

     dstruct(s, vhdr, lpData, "p");

     dstruct(s, vhdr, dwBufferLength, "lu");

@@ -26,8 +26,6 @@

 #include "avformat.h"

 #include "apetag.h"

-#define ENABLE_DEBUG 0

-

 /* The earliest and latest file formats supported by this library */

 #define APE_MIN_VERSION 3950

 #define APE_MAX_VERSION 3990

@@ -96,7 +94,7 @@ static int ape_probe(AVProbeData * p)

 static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx)

 {

-#if ENABLE_DEBUG

+#ifdef DEBUG

     int i;

     av_log(s, AV_LOG_DEBUG, "Descriptor Block:\n\n");

@@ -24,8 +24,6 @@

 #include "avformat.h"

 #include "apetag.h"

-#define ENABLE_DEBUG 0

-

 #define APE_TAG_VERSION               2000

 #define APE_TAG_FOOTER_BYTES          32

 #define APE_TAG_FLAG_CONTAINS_HEADER  (1 << 31)

@@ -45,7 +45,6 @@

 #include "url.h"

 //#define DEBUG

-//#define DEBUG_RTP_TCP

 /* Timeout values for socket poll, in ms,

  * and read_packet(), in seconds  */

@@ -860,9 +859,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,

         q = buf;

         for (;;) {

             ret = ffurl_read_complete(rt->rtsp_hd, &ch, 1);

-#ifdef DEBUG_RTP_TCP

             av_dlog(s, "ret=%d c=%02x [%c]\n", ret, ch, ch);

-#endif

             if (ret != 1)

                 return AVERROR_EOF;

             if (ch == '\n')