summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ffplay.c5
-rw-r--r--libavcodec/dvbsubdec.c7
-rw-r--r--libavcodec/ppc/h264_template_altivec.c3
-rw-r--r--libavformat/rtspdec.c7
4 files changed, 5 insertions, 17 deletions
diff --git a/ffplay.c b/ffplay.c
index e036bbdf94..4ccad0618d 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -56,9 +56,6 @@
const char program_name[] = "ffplay";
const int program_birth_year = 2003;
-//#define DEBUG
-//#define DEBUG_SYNC
-
#define MAX_QUEUE_SIZE (15 * 1024 * 1024)
#define MIN_AUDIOQ_SIZE (20 * 16 * 1024)
#define MIN_FRAMES 5
@@ -2056,7 +2053,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
n = 2 * dec->channels;
is->audio_clock += (double)data_size /
(double)(n * dec->sample_rate);
-#if defined(DEBUG_SYNC)
+#ifdef DEBUG
{
static double last_clock;
printf("audio: delay=%0.3f clock=%0.3f pts=%0.3f\n",
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 2c27f6b527..b6b57b8915 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -26,7 +26,6 @@
//#define DEBUG
//#define DEBUG_PACKET_CONTENTS
-//#define DEBUG_SAVE_IMAGES
#define DVBSUB_PAGE_SEGMENT 0x10
#define DVBSUB_REGION_SEGMENT 0x11
@@ -37,7 +36,7 @@
#define cm (ff_cropTbl + MAX_NEG_CROP)
-#ifdef DEBUG_SAVE_IMAGES
+#ifdef DEBUG
#undef fprintf
#if 0
static void png_save(const char *filename, uint8_t *bitmap, int w, int h,
@@ -1174,7 +1173,7 @@ static void dvbsub_parse_page_segment(AVCodecContext *avctx,
}
-#ifdef DEBUG_SAVE_IMAGES
+#ifdef DEBUG
static void save_display_set(DVBSubContext *ctx)
{
DVBSubRegion *region;
@@ -1387,7 +1386,7 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf,
sub->num_rects = i;
-#ifdef DEBUG_SAVE_IMAGES
+#ifdef DEBUG
save_display_set(ctx);
#endif
diff --git a/libavcodec/ppc/h264_template_altivec.c b/libavcodec/ppc/h264_template_altivec.c
index 020d7c7023..2a8f4bf672 100644
--- a/libavcodec/ppc/h264_template_altivec.c
+++ b/libavcodec/ppc/h264_template_altivec.c
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-//#define DEBUG_ALIGNMENT
-#ifdef DEBUG_ALIGNMENT
+#ifdef DEBUG
#define ASSERT_ALIGNED(ptr) assert(((unsigned long)ptr&0x0000000F));
#else
#define ASSERT_ALIGNED(ptr) ;
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index fa6bc05517..9cd9be1d4b 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -31,9 +31,6 @@
#include "rdt.h"
#include "url.h"
-//#define DEBUG
-//#define DEBUG_RTP_TCP
-
static int rtsp_read_play(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
@@ -191,9 +188,7 @@ int ff_rtsp_tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
int id, len, i, ret;
RTSPStream *rtsp_st;
-#ifdef DEBUG_RTP_TCP
av_dlog(s, "tcp_read_packet:\n");
-#endif
redo:
for (;;) {
RTSPMessageHeader reply;
@@ -212,9 +207,7 @@ redo:
return -1;
id = buf[0];
len = AV_RB16(buf + 1);
-#ifdef DEBUG_RTP_TCP
av_dlog(s, "id=%d len=%d\n", id, len);
-#endif
if (len > buf_size || len < 12)
goto redo;
/* get the data */