diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:32:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:32:10 +0100 |
| commit | 60190d8612d10d58bb827709550e5ef4dafc50f7 (patch) | |
| tree | acad7264331d042086a9480c01219fb09ea6a71d | |
| parent | 3832db1223999819e2846284292ea6f3ef1b1c49 (diff) | |
| parent | 90a2359fef5325f90aec0eca51b145d90ca3df7d (diff) | |
| download | ffmpeg-60190d8612d10d58bb827709550e5ef4dafc50f7.tar.gz | |
Merge commit '90a2359fef5325f90aec0eca51b145d90ca3df7d' into release/0.10
* commit '90a2359fef5325f90aec0eca51b145d90ca3df7d':
nutdec: Remove unused and broken debug function stub
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/nutdec.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 5dd687c55d..319f9ff6cd 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -81,16 +81,8 @@ static inline int64_t get_s_trace(AVIOContext *bc, char *file, char *func, int l 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_vb_trace(AVIOContext *bc, char *file, char *func, int line){ - uint64_t v= get_vb(bc); - - av_log(NULL, AV_LOG_DEBUG, "get_vb %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__) #endif static int get_packetheader(NUTContext *nut, AVIOContext *bc, int calculate_checksum, uint64_t startcode) |