RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nutdec: fix get_vb_trace() / -DTRACE compile 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-28 14:21:27 +02:00
parent 2acb5cd907
commit c402d36afa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/nutdec.c
View File

@ -97,18 +97,18 @@ static inline int64_t get_s_trace(AVIOContext *bc, const char *file,
return v; 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) 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); v, v, file, func, line);
return v; return v;
} }
#define ffio_read_varlen(bc) get_v_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) #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_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 #endif
static int get_packetheader(NUTContext *nut, AVIOContext *bc, static int get_packetheader(NUTContext *nut, AVIOContext *bc,