[Ffmpeg-cvslog] r8295 - in trunk: libavcodec/h263dec.c libavcodec/wma.c libavformat/rtp_h264.c libavutil/internal.h
mbardiaux
subversion
Thu Mar 8 15:49:43 CET 2007
Author: mbardiaux
Date: Thu Mar 8 15:49:43 2007
New Revision: 8295
Modified:
trunk/libavcodec/h263dec.c
trunk/libavcodec/wma.c
trunk/libavformat/rtp_h264.c
trunk/libavutil/internal.h
Log:
Corrections so that builds with DEBUG work
Modified: trunk/libavcodec/h263dec.c
==============================================================================
--- trunk/libavcodec/h263dec.c (original)
+++ trunk/libavcodec/h263dec.c Thu Mar 8 15:49:43 2007
@@ -429,7 +429,8 @@ uint64_t time= rdtsc();
#endif
#ifdef DEBUG
av_log(avctx, AV_LOG_DEBUG, "*****frame %d size=%d\n", avctx->frame_number, buf_size);
- av_log(avctx, AV_LOG_DEBUG, "bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
+ if(buf_size>0)
+ av_log(avctx, AV_LOG_DEBUG, "bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
#endif
s->flags= avctx->flags;
s->flags2= avctx->flags2;
Modified: trunk/libavcodec/wma.c
==============================================================================
--- trunk/libavcodec/wma.c (original)
+++ trunk/libavcodec/wma.c Thu Mar 8 15:49:43 2007
@@ -171,7 +171,7 @@ int ff_wma_init(AVCodecContext * avctx,
high_freq = high_freq * 0.5;
}
}
- dprintf("flags1=0x%x flags2=0x%x\n", flags1, flags2);
+ dprintf("flags2=0x%x\n", flags2);
dprintf("version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n",
s->version, s->nb_channels, s->sample_rate, s->bit_rate,
s->block_align);
Modified: trunk/libavformat/rtp_h264.c
==============================================================================
--- trunk/libavformat/rtp_h264.c (original)
+++ trunk/libavformat/rtp_h264.c Thu Mar 8 15:49:43 2007
@@ -164,7 +164,9 @@ static int h264_handle_packet(RTPDemuxCo
const uint8_t * buf,
int len)
{
-// h264_rtp_extra_data *data = s->dynamic_protocol_context;
+#ifdef DEBUG
+ h264_rtp_extra_data *data = s->dynamic_protocol_context;
+#endif
uint8_t nal = buf[0];
uint8_t type = (nal & 0x1f);
int result= 0;
Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h (original)
+++ trunk/libavutil/internal.h Thu Mar 8 15:49:43 2007
@@ -150,9 +150,9 @@
/* dprintf macros */
#ifdef DEBUG
-# define dprintf(fmt,...) av_log(NULL, AV_LOG_DEBUG, fmt, __VA_ARGS__)
+# define dprintf(...) av_log(NULL, AV_LOG_DEBUG, __VA_ARGS__)
#else
-# define dprintf(fmt,...)
+# define dprintf(...)
#endif
#define av_abort() do { av_log(NULL, AV_LOG_ERROR, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0)
More information about the ffmpeg-cvslog
mailing list