summaryrefslogtreecommitdiff
path: root/libavcodec/pngdec.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-07-30 21:00:08 +0000
committerDiego Biurrun <diego@biurrun.de>2009-07-30 21:00:08 +0000
commit8b44de14d1fa363fa7fe18d015ead0017a0177c8 (patch)
treea4ddabf3ea7c9fa492b3448341678aba350af933 /libavcodec/pngdec.c
parent7881793dd0b83bf96ef83c4780da6baeb255406e (diff)
Change av_log() calls surrounded by '#ifdef DEBUG' into dprintf macros.
Originally committed as revision 19550 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/pngdec.c')
-rw-r--r--libavcodec/pngdec.c26
1 files changed, 10 insertions, 16 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 5711c8ad88..29644f5095 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -430,13 +430,11 @@ static int decode_frame(AVCodecContext *avctx,
goto fail;
tag32 = bytestream_get_be32(&s->bytestream);
tag = bswap_32(tag32);
-#ifdef DEBUG
- av_log(avctx, AV_LOG_DEBUG, "png: tag=%c%c%c%c length=%u\n",
- (tag & 0xff),
- ((tag >> 8) & 0xff),
- ((tag >> 16) & 0xff),
- ((tag >> 24) & 0xff), length);
-#endif
+ dprintf(avctx, "png: tag=%c%c%c%c length=%u\n",
+ (tag & 0xff),
+ ((tag >> 8) & 0xff),
+ ((tag >> 16) & 0xff),
+ ((tag >> 24) & 0xff), length);
switch(tag) {
case MKTAG('I', 'H', 'D', 'R'):
if (length != 13)
@@ -454,11 +452,9 @@ static int decode_frame(AVCodecContext *avctx,
s->interlace_type = *s->bytestream++;
crc = bytestream_get_be32(&s->bytestream);
s->state |= PNG_IHDR;
-#ifdef DEBUG
- av_log(avctx, AV_LOG_DEBUG, "width=%d height=%d depth=%d color_type=%d compression_type=%d filter_type=%d interlace_type=%d\n",
- s->width, s->height, s->bit_depth, s->color_type,
- s->compression_type, s->filter_type, s->interlace_type);
-#endif
+ dprintf(avctx, "width=%d height=%d depth=%d color_type=%d compression_type=%d filter_type=%d interlace_type=%d\n",
+ s->width, s->height, s->bit_depth, s->color_type,
+ s->compression_type, s->filter_type, s->interlace_type);
break;
case MKTAG('I', 'D', 'A', 'T'):
if (!(s->state & PNG_IHDR))
@@ -518,10 +514,8 @@ static int decode_frame(AVCodecContext *avctx,
s->width);
s->crow_size = s->pass_row_size + 1;
}
-#ifdef DEBUG
- av_log(avctx, AV_LOG_DEBUG, "row_size=%d crow_size =%d\n",
- s->row_size, s->crow_size);
-#endif
+ dprintf(avctx, "row_size=%d crow_size =%d\n",
+ s->row_size, s->crow_size);
s->image_buf = p->data[0];
s->image_linesize = p->linesize[0];
/* copy the palette if needed */