diff options
| author | Diego Biurrun <diego@biurrun.de> | 2015-12-11 18:58:12 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-10-27 12:54:07 +0200 |
| commit | 07eea5a5ded1141632aefecfa59dcdc26de2d7ea (patch) | |
| tree | 5e5ebe2311ba09a6eeb68292d9c12d5dcda1e0ec | |
| parent | c3dad1bf3b5e04e01c291b1ac41e6bef0adf2206 (diff) | |
| download | ffmpeg-streaming-07eea5a5ded1141632aefecfa59dcdc26de2d7ea.zip ffmpeg-streaming-07eea5a5ded1141632aefecfa59dcdc26de2d7ea.tar.gz | |
nut: Drop pointless TRACE level debug code
The code has little usefulness and uses the __PRETTY_FUNCTION__ GNU extension.
| -rw-r--r-- | libavformat/nutdec.c | 26 | ||||
| -rw-r--r-- | libavformat/nutenc.c | 20 |
2 files changed, 0 insertions, 46 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index e1a9f6d..2507663 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -76,36 +76,10 @@ static uint64_t get_fourcc(AVIOContext *bc) return -1; } -#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; -} - -#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__) -#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 bf23b58..3c824a6 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -285,26 +285,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) |
