From c402d36afa9913800a08bc5fffce2ebfa8bbb309 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 28 Sep 2012 14:21:27 +0200 Subject: [PATCH] nutdec: fix get_vb_trace() / -DTRACE compile Signed-off-by: Michael Niedermayer --- libavformat/nutdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 4179fbed2e..d6732b289b 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -97,18 +97,18 @@ static inline int64_t get_s_trace(AVIOContext *bc, const char *file, return v; } -static inline uint64_t get_vb_trace(AVIOContext *bc, char *file, +static inline uint64_t get_4cc_trace(AVIOContext *bc, char *file, char *func, int line) { - uint64_t v = get_vb(bc); + uint64_t v = get_fourcc(bc); - av_log(NULL, AV_LOG_DEBUG, "get_vb %5"PRId64" / %"PRIX64" in %s %s:%d\n", + av_log(NULL, AV_LOG_DEBUG, "get_fourcc %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line); return v; } #define ffio_read_varlen(bc) get_v_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define get_s(bc) get_s_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define get_vb(bc) get_vb_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) +#define get_fourcc(bc) get_4cc_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) #endif static int get_packetheader(NUTContext *nut, AVIOContext *bc,