From 20306e5390ff5f50dd717987b4b48d4e5ce11123 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Mon, 24 Jun 2024 11:42:57 -0400 Subject: [PATCH 1/3] libavformat/demux.c: remove errant doxygen comment It was originally for a different function av_destruct_packet_nofree: https://github.com/MythTV/mythtv/commit/bf432d9290144a03f3938faaacf8d9564c156fd2#diff-4b6a432208acd44651f07cdde943169aba8c5611b26a83764ad784d00c250f7fR899 --- libavformat/demux.c | 5 ----- 1 file changed, 5 deletions(-) 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); From 648010fb51e9cfe430af59641c3eeffdd4d6c3e3 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Mon, 24 Jun 2024 12:15:40 -0400 Subject: [PATCH 2/3] Revert "fix non UTF-8 files (external)" This reverts commit 049fabc8d8f10684bf60a1f96e344564c478f7e9. Reduce changes to FFmpeg. --- tools/clean-diff | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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' From 267d948ac6bd8f85beba590460f77b85bf7c70a3 Mon Sep 17 00:00:00 2001 From: Scott Theisen Date: Mon, 24 Jun 2024 20:44:04 -0400 Subject: [PATCH 3/3] libavcodec/v4l2_buffers.c: revert unnecessary change --- libavcodec/v4l2_buffers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);