diff options
author | Mans Rullgard <mans@mansr.com> | 2011-01-25 05:24:43 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-26 05:43:30 +0300 |
commit | 3e8c4f96890294e1b7de2d22ab3cfec7e1d7c48f (patch) | |
tree | ed70d47f32787b72269df1867283465f776b6699 /libavformat/avidec.c | |
parent | 53d3f66baef259a1413e338229508ff32ee78c70 (diff) |
avidec: make print_tag() a macro and remove related ifdefs
The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6081f8c4e283bf1b33e4cf4b2ca44217219f9210)
Diffstat (limited to 'libavformat/avidec.c')
-rw-r--r-- | libavformat/avidec.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 15f48e8ac7..d02e188ca6 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -84,17 +84,13 @@ static const char avi_headers[][8] = { static int avi_load_index(AVFormatContext *s); static int guess_ni_flag(AVFormatContext *s); -#ifdef DEBUG -static void print_tag(const char *str, unsigned int tag, int size) -{ - dprintf(NULL, "%s: tag=%c%c%c%c size=0x%x\n", - str, tag & 0xff, - (tag >> 8) & 0xff, - (tag >> 16) & 0xff, - (tag >> 24) & 0xff, - size); -} -#endif +#define print_tag(str, tag, size) \ + dprintf(NULL, "%s: tag=%c%c%c%c size=0x%x\n", \ + str, tag & 0xff, \ + (tag >> 8) & 0xff, \ + (tag >> 16) & 0xff, \ + (tag >> 24) & 0xff, \ + size) static inline int get_duration(AVIStream *ast, int len){ if(ast->sample_size){ @@ -369,18 +365,17 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) goto fail; tag = get_le32(pb); size = get_le32(pb); -#ifdef DEBUG + print_tag("tag", tag, size); -#endif switch(tag) { case MKTAG('L', 'I', 'S', 'T'): list_end = url_ftell(pb) + size; /* Ignored, except at start of video packets. */ tag1 = get_le32(pb); -#ifdef DEBUG + print_tag("list", tag1, 0); -#endif + if (tag1 == MKTAG('m', 'o', 'v', 'i')) { avi->movi_list = url_ftell(pb) - 4; if(size) avi->movi_end = avi->movi_list + size + (size & 1); @@ -447,9 +442,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) if(amv_file_format) tag1 = stream_index ? MKTAG('a','u','d','s') : MKTAG('v','i','d','s'); -#ifdef DEBUG print_tag("strh", tag1, -1); -#endif + if(tag1 == MKTAG('i', 'a', 'v', 's') || tag1 == MKTAG('i', 'v', 'a', 's')){ int64_t dv_dur; @@ -607,9 +601,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec->palctrl->palette_changed = 1; } -#ifdef DEBUG print_tag("video", tag1, 0); -#endif + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_tag = tag1; st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); |