---
ffserver.c | 4 ++--
libavcodec/cook.c | 5 ++---
libavcodec/indeo5.c | 2 +-
libavcodec/ivi_common.c | 2 +-
libavcodec/ivi_common.h | 2 --
libavcodec/svq1dec.c | 3 ---
libavcodec/vorbis.c | 9 +++------
libavcodec/vorbisdec.c | 16 +++++++---------
libavdevice/dv1394.c | 3 ---
libavdevice/vfwcap.c | 4 +---
libavformat/ape.c | 4 +---
libavformat/apetag.c | 2 --
libavformat/rtsp.c | 3 ---
13 files changed, 18 insertions(+), 41 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 56bcba5..30edb05 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -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
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index e6e2508..84211a6 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -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;
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index 088b45a..ba1bc18 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.c
@@ -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) {
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index 2b684e8..bd3d4e6 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -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;
diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h
index 0a5e9b1..fd3d825 100644
--- a/libavcodec/ivi_common.h
+++ b/libavcodec/ivi_common.h
@@ -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
/**
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index ef4cde1..fc36bc3 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -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, ¤t[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;
}
}
diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index 7198abe..f413170 100644
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -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)
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index a0d6495..6417356 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -20,9 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#undef V_DEBUG
-//#define V_DEBUG
-//#define AV_DEBUG(...) av_log(NULL, AV_LOG_INFO, __VA_ARGS__)
+#ifdef DEBUG
+#define AV_DEBUG(...)
+#else
+#define AV_DEBUG(...) av_log(NULL, AV_LOG_INFO, __VA_ARGS__)
+#endif
#include <math.h>
@@ -41,10 +43,6 @@
#define V_MAX_VLCS (1 << 16)
#define V_MAX_PARTITIONS (1 << 20)
-#ifndef V_DEBUG
-#define AV_DEBUG(...)
-#endif
-
#undef NDEBUG
#include <assert.h>
@@ -810,7 +808,7 @@ static void create_map(vorbis_context *vc, unsigned
floor_number)
vf->map_size[blockflag] = n;
}
-#ifdef V_DEBUG
+#ifdef DEBUG
for (idx = 0; idx <= n; ++idx) {
AV_DEBUG("floor0 map: map at pos %d is %d\n",
idx, map[idx]);
@@ -1077,7 +1075,7 @@ static int vorbis_floor0_decode(vorbis_context *vc,
lsp_len += codebook.dimensions;
}
-#ifdef V_DEBUG
+#ifdef DEBUG
/* DEBUG: output lsp coeffs */
{
int idx;
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index f414eb3..565cf4c 100644
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -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"
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index c021831..5dd873b 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -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");
diff --git a/libavformat/ape.c b/libavformat/ape.c
index d7c1447..90b0261 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -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");
diff --git a/libavformat/apetag.c b/libavformat/apetag.c
index 6e92535..2eb1673 100644
--- a/libavformat/apetag.c
+++ b/libavformat/apetag.c
@@ -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)
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 2d1438d..c78b762 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -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')
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
