summaryrefslogtreecommitdiff
path: root/libavformat/nutdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-28 14:21:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-28 14:21:53 +0200
commitc402d36afa9913800a08bc5fffce2ebfa8bbb309 (patch)
tree2eb41df5cb63d2dccb6818edec90675e9474f922 /libavformat/nutdec.c
parent2acb5cd90793de7f375bf6ebf4eabe2b59a2ecc3 (diff)
nutdec: fix get_vb_trace() / -DTRACE compile
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutdec.c')
-rw-r--r--libavformat/nutdec.c8
1 files 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,