Merge commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea'

* commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea':
  nut: Drop pointless TRACE level debug code

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavformat/nutdec.c
index ca34e35,2507663..4272f88
--- 1/libavformat/nutdec.c
--- 2/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@@ -80,47 -72,10 +80,12 @@@ static uint64_t get_fourcc(AVIOContext 
          return avio_rl16(bc);
      else if (len == 4)
          return avio_rl32(bc);
 -    else
 +    else {
 +        av_log(NULL, AV_LOG_ERROR, "Unsupported fourcc length %d\n", len);
          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;
- }
- 
- 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)
  {

diff --cc libavformat/nutenc.c
Simple merge