aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-06-02 22:45:15 +0200
committerDiego Biurrun <diego@biurrun.de>2011-06-03 00:44:06 +0200
commitf190f676bc93a7e80344f2feeb3b9b44604d4717 (patch)
treed450a39677cd2e45abdea10256675ac7267cce92 /libavformat
parent068aa387128850da488af262d54986d03eebe423 (diff)
downloadffmpeg-f190f676bc93a7e80344f2feeb3b9b44604d4717.tar.gz
Replace custom DEBUG preprocessor trickery by the standard one.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/ape.c4
-rw-r--r--libavformat/apetag.c2
-rw-r--r--libavformat/rtsp.c3
3 files changed, 1 insertions, 8 deletions
diff --git a/libavformat/ape.c b/libavformat/ape.c
index d7c1447b01..90b02619e0 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 6e925354af..2eb1673cc4 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 2d1438d3ed..c78b762a36 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')