diff options
| -rw-r--r-- | libavformat/nutdec.c | 36 | ||||
| -rw-r--r-- | libavformat/nutenc.c | 19 |
2 files changed, 0 insertions, 55 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index ca34e35f74..4272f8816c 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -86,46 +86,10 @@ static uint64_t get_fourcc(AVIOContext *bc) } } -#ifdef TRACE -static inline uint64_t get_v_trace(AVIOContext *bc, const char *file, - const char *func, int line) -{ - uint64_t v = ffio_read_varlen(bc); - - av_log(NULL, AV_LOG_DEBUG, "get_v %5"PRId64" / %"PRIX64" in %s %s:%d\n", - v, v, file, func, line); - return v; -} - -static inline int64_t get_s_trace(AVIOContext *bc, const char *file, - const char *func, int line) -{ - int64_t v = get_s(bc); - - av_log(NULL, AV_LOG_DEBUG, "get_s %5"PRId64" / %"PRIX64" in %s %s:%d\n", - v, v, file, func, line); - return v; -} - -static inline uint64_t get_4cc_trace(AVIOContext *bc, char *file, - char *func, int line) -{ - uint64_t v = get_fourcc(bc); - - 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_fourcc(bc) get_4cc_trace(bc, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#endif - static int get_packetheader(NUTContext *nut, AVIOContext *bc, int calculate_checksum, uint64_t startcode) { int64_t size; -// start = avio_tell(bc) - 8; startcode = av_be2ne64(startcode); startcode = ff_crc04C11DB7_update(0, (uint8_t*) &startcode, 8); diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 9e422e1aa8..a92ff55c01 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -299,25 +299,6 @@ static void put_s(AVIOContext *bc, int64_t val) ff_put_v(bc, 2 * FFABS(val) - (val > 0)); } -#ifdef TRACE -static inline void ff_put_v_trace(AVIOContext *bc, uint64_t v, const char *file, - const char *func, int line) -{ - av_log(NULL, AV_LOG_DEBUG, "ff_put_v %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line); - - ff_put_v(bc, v); -} - -static inline void put_s_trace(AVIOContext *bc, int64_t v, const char *file, const char *func, int line) -{ - av_log(NULL, AV_LOG_DEBUG, "put_s %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line); - - put_s(bc, v); -} -#define ff_put_v(bc, v) ff_put_v_trace(bc, v, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define put_s(bc, v) put_s_trace(bc, v, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#endif - //FIXME remove calculate_checksum static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, int calculate_checksum, uint64_t startcode) |