[SCM] libav/wheezy-security: nutdec: Remove unused and broken debug function stub

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Oct 19 20:18:09 UTC 2014


The following commit has been merged in the wheezy-security branch:
commit 90a2359fef5325f90aec0eca51b145d90ca3df7d
Author: Diego Biurrun <diego at biurrun.de>
Date:   Tue Sep 25 19:01:10 2012 +0200

    nutdec: Remove unused and broken debug function stub
    
    (cherry picked from commit 83655442fa6dbf7578d108ce479f98a14ebb3e3c)
    Signed-off-by: Diego Biurrun <diego at biurrun.de>
    
    Conflicts:
    	libavformat/nutdec.c

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 9cec89e..d7a3048 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)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list