diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c
index 2af930597c80d..4c40b437554a4 100644
--- a/libavcodec/v4l2_buffers.c
+++ b/libavcodec/v4l2_buffers.c
@@ -307,7 +307,7 @@ static uint8_t * v4l2_get_drm_frame(V4L2Buffer *avbuf)
 }
 #endif
 
-static void v4l2_free_buffer(void *opaque, uint8_t *data)
+static void v4l2_free_buffer(void *opaque, uint8_t *unused)
 {
     V4L2Buffer* avbuf = opaque;
     V4L2m2mContext *s = buf_to_m2mctx(avbuf);
diff --git a/libavformat/demux.c b/libavformat/demux.c
index e26638f32cd04..078ce35b2b8b2 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -1240,11 +1240,6 @@ static int64_t ts_to_samples(AVStream *st, int64_t ts)
     return av_rescale(ts, st->time_base.num * st->codecpar->sample_rate, st->time_base.den);
 }
 
-/**
- * Simply sets data pointer to null.
- *
- * This will leak memory if no one else frees the memory used by the packet.
- */
 static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
 {
     FFFormatContext *const si = ffformatcontext(s);
diff --git a/tools/clean-diff b/tools/clean-diff
index d40f22f34fd52..4600702b10fb6 100755
--- a/tools/clean-diff
+++ b/tools/clean-diff
@@ -4,8 +4,8 @@ sed '/^+[^+]/!s/	/TaBBaT/g' |\
  sed 's/TaBBaT/	/g' |\
  sed '/^+[^+]/s/ * $//' |\
  tr -d '\015' |\
- tr '\n' '°' |\
- sed 's/\(@@[^@]*@@°[^@]*\)/\n\1/g' |\
- egrep -v '@@[^@]*@@°(( [^°]*°)|([+-][[:space:]]*°)|(-[[:space:]]*([^°]*)°\+[[:space:]]*\5°))*$' |\
+ tr '\n' '°' |\
+ sed 's/\(@@[^@]*@@°[^@]*\)/\n\1/g' |\
+ egrep -v '@@[^@]*@@°(( [^°]*°)|([+-][[:space:]]*°)|(-[[:space:]]*([^°]*)°\+[[:space:]]*\5°))*$' |\
  tr -d '\n' |\
- tr '°' '\n'
+ tr '°' '\n'