diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-05-27 20:34:01 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-06-03 15:43:34 +0200 |
| commit | 43b6c3eb182617ff08e72584e1c4635ac20d33e8 (patch) | |
| tree | 3816565f4b42524c667d1a27875847675e616347 | |
| parent | a5514a84748e90adbbfa2661ccea1e004e6ef604 (diff) | |
| download | ffmpeg-43b6c3eb182617ff08e72584e1c4635ac20d33e8.tar.gz | |
mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro.
| -rw-r--r-- | libavformat/internal.h | 6 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 13 |
2 files changed, 10 insertions, 9 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 6f1305ce25..ad3d9c91c2 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -26,6 +26,12 @@ #define MAX_URL_SIZE 4096 +#ifdef DEBUG +# define hex_dump_debug(class, buf, size) av_hex_dump_log(class, AV_LOG_DEBUG, buf, size) +#else +# define hex_dump_debug(class, buf, size) +#endif + typedef struct AVCodecTag { enum CodecID id; unsigned int tag; diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 33675f470f..f675bf03fb 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1014,10 +1014,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len int mp4_dec_config_descr_len = 0; int mp4_es_id = 0; -#ifdef DEBUG av_dlog(ts->stream, "PMT: len %i\n", section_len); - av_hex_dump_log(ts->stream, AV_LOG_DEBUG, (uint8_t *)section, section_len); -#endif + hex_dump_debug(ts->stream, (uint8_t *)section, section_len); p_end = section + section_len - 4; p = section; @@ -1134,10 +1132,9 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len const uint8_t *p, *p_end; int sid, pmt_pid; -#ifdef DEBUG av_dlog(ts->stream, "PAT:\n"); - av_hex_dump_log(ts->stream, AV_LOG_DEBUG, (uint8_t *)section, section_len); -#endif + hex_dump_debug(ts->stream, (uint8_t *)section, section_len); + p_end = section + section_len - 4; p = section; if (parse_section_header(h, &p, p_end) < 0) @@ -1178,10 +1175,8 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len int onid, val, sid, desc_list_len, desc_tag, desc_len, service_type; char *name, *provider_name; -#ifdef DEBUG av_dlog(ts->stream, "SDT:\n"); - av_hex_dump_log(ts->stream, AV_LOG_DEBUG, (uint8_t *)section, section_len); -#endif + hex_dump_debug(ts->stream, (uint8_t *)section, section_len); p_end = section + section_len - 4; p = section; |