Corrections so that builds with DEBUG work

Originally committed as revision 8295 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michel Bardiaux 18 years ago
parent 07cbff39a7
commit bdb4b698d8
  1. 1
      libavcodec/h263dec.c
  2. 2
      libavcodec/wma.c
  3. 4
      libavformat/rtp_h264.c
  4. 4
      libavutil/internal.h

@ -429,6 +429,7 @@ uint64_t time= rdtsc();
#endif #endif
#ifdef DEBUG #ifdef DEBUG
av_log(avctx, AV_LOG_DEBUG, "*****frame %d size=%d\n", avctx->frame_number, buf_size); av_log(avctx, AV_LOG_DEBUG, "*****frame %d size=%d\n", avctx->frame_number, buf_size);
if(buf_size>0)
av_log(avctx, AV_LOG_DEBUG, "bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]); av_log(avctx, AV_LOG_DEBUG, "bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
#endif #endif
s->flags= avctx->flags; s->flags= avctx->flags;

@ -171,7 +171,7 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
high_freq = high_freq * 0.5; 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", 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->version, s->nb_channels, s->sample_rate, s->bit_rate,
s->block_align); s->block_align);

@ -164,7 +164,9 @@ static int h264_handle_packet(RTPDemuxContext * s,
const uint8_t * buf, const uint8_t * buf,
int len) 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 nal = buf[0];
uint8_t type = (nal & 0x1f); uint8_t type = (nal & 0x1f);
int result= 0; int result= 0;

@ -150,9 +150,9 @@
/* dprintf macros */ /* dprintf macros */
#ifdef DEBUG #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 #else
# define dprintf(fmt,...) # define dprintf(...)
#endif #endif
#define av_abort() do { av_log(NULL, AV_LOG_ERROR, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0) #define av_abort() do { av_log(NULL, AV_LOG_ERROR, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0)

Loading…
Cancel
Save