Control: tags 1004771 + patch
Control: tags 1004771 + pending
Dear maintainer,
I've prepared an NMU for gegl (versioned as 1:0.4.36-3.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Cheers
--
Sebastian Ramacher
diff -Nru gegl-0.4.36/debian/changelog gegl-0.4.36/debian/changelog
--- gegl-0.4.36/debian/changelog 2022-03-25 18:03:00.000000000 +0100
+++ gegl-0.4.36/debian/changelog 2022-06-23 19:06:53.000000000 +0200
@@ -1,3 +1,11 @@
+gegl (1:0.4.36-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches: Apply upstream patches to fix build with ffmpeg 5.0
+ (Closes: #1004771)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Thu, 23 Jun 2022 19:06:53 +0200
+
gegl (1:0.4.36-3) unstable; urgency=medium
* debian/libgegl-0.4-0.symbols: Add optional symbols for armel/armhf
diff -Nru gegl-0.4.36/debian/patches/Add-missing-include-directives-to-ff-load.c-and-ff-save.c.patch gegl-0.4.36/debian/patches/Add-missing-include-directives-to-ff-load.c-and-ff-save.c.patch
--- gegl-0.4.36/debian/patches/Add-missing-include-directives-to-ff-load.c-and-ff-save.c.patch 1970-01-01 01:00:00.000000000 +0100
+++ gegl-0.4.36/debian/patches/Add-missing-include-directives-to-ff-load.c-and-ff-save.c.patch 2022-06-23 19:06:20.000000000 +0200
@@ -0,0 +1,38 @@
+From: Behnam Momeni <sbmom...@gmail.com>
+Date: Fri, 4 Mar 2022 20:05:10 +0330
+Subject: Add missing include directives to ff-load.c and ff-save.c
+
+---
+ operations/external/ff-load.c | 2 ++
+ operations/external/ff-save.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
+index 0d9a4f3..c40b705 100644
+--- a/operations/external/ff-load.c
++++ b/operations/external/ff-load.c
+@@ -62,9 +62,11 @@ property_audio_fragment (audio, _("audio"), 0)
+ #include <limits.h>
+ #include <stdlib.h>
+
++#include <libavutil/channel_layout.h>
+ #include <libavutil/avutil.h>
+ #include <libavutil/imgutils.h>
+ #include <libavformat/avformat.h>
++#include <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+
+
+diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
+index 8dfb3ee..6e345fa 100644
+--- a/operations/external/ff-save.c
++++ b/operations/external/ff-save.c
+@@ -82,6 +82,8 @@ property_int (me_subpel_quality, _("me-subpel-quality"), 0)
+
+ #include "gegl-op.h"
+
++#include <libavutil/channel_layout.h>
++#include <libavutil/imgutils.h>
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/avutil.h>
diff -Nru gegl-0.4.36/debian/patches/Call-avcodec_receive_-functions-in-a-loop-to-fetch-all-fr.patch gegl-0.4.36/debian/patches/Call-avcodec_receive_-functions-in-a-loop-to-fetch-all-fr.patch
--- gegl-0.4.36/debian/patches/Call-avcodec_receive_-functions-in-a-loop-to-fetch-all-fr.patch 1970-01-01 01:00:00.000000000 +0100
+++ gegl-0.4.36/debian/patches/Call-avcodec_receive_-functions-in-a-loop-to-fetch-all-fr.patch 2022-06-23 19:06:20.000000000 +0200
@@ -0,0 +1,552 @@
+From: Behnam Momeni <sbmom...@gmail.com>
+Date: Mon, 21 Mar 2022 15:06:03 +0330
+Subject: Call avcodec_receive_*() functions in a loop to fetch all
+ frames/packets
+
+---
+ operations/external/ff-load.c | 201 +++++++++++++++++++++-------------------
+ operations/external/ff-save.c | 208 +++++++++++++++++++++---------------------
+ 2 files changed, 211 insertions(+), 198 deletions(-)
+
+diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
+index c8889f3..2f658dd 100644
+--- a/operations/external/ff-load.c
++++ b/operations/external/ff-load.c
+@@ -211,7 +211,7 @@ decode_audio (GeglOperation *operation,
+ while (p->prevapts <= pts2)
+ {
+ AVPacket pkt = {0,};
+- int decoded_bytes;
++ int ret;
+
+ if (av_read_frame (p->audio_fcontext, &pkt) < 0)
+ {
+@@ -221,86 +221,93 @@ decode_audio (GeglOperation *operation,
+ if (pkt.stream_index==p->audio_index && p->audio_stream)
+ {
+ static AVFrame frame;
+- int got_frame;
+
+- decoded_bytes = avcodec_send_packet (p->audio_ctx, &pkt);
+- if (decoded_bytes < 0)
++ ret = avcodec_send_packet (p->audio_ctx, &pkt);
++ if (ret < 0)
+ {
+ fprintf (stderr, "avcodec_send_packet failed for %s\n",
+ o->path);
+ }
+- else
++ while (ret == 0)
+ {
+- decoded_bytes = avcodec_receive_frame (p->audio_ctx, &frame);
+- if (decoded_bytes < 0)
++ ret = avcodec_receive_frame (p->audio_ctx, &frame);
++ if (ret == AVERROR(EAGAIN))
++ {
++ // no more frames; should send the next packet now
++ ret = 0;
++ break;
++ }
++ else if (ret < 0)
+ {
+ fprintf (stderr, "avcodec_receive_frame failed for %s\n",
+ o->path);
+- }
+- else
+- got_frame = 1;
+- }
+-
+- if (got_frame) {
+- int samples_left = frame.nb_samples;
+- int si = 0;
+-
+- while (samples_left)
+- {
+- int sample_count = samples_left;
+- int channels = MIN(p->audio_stream->codecpar->channels, GEGL_MAX_AUDIO_CHANNELS);
+- GeglAudioFragment *af = gegl_audio_fragment_new (o->audio_sample_rate, channels,
+- AV_CH_LAYOUT_STEREO, samples_left);
+-//);
+- switch (p->audio_ctx->sample_fmt)
+- {
+- case AV_SAMPLE_FMT_FLT:
+- for (gint i = 0; i < sample_count; i++)
+- for (gint c = 0; c < channels; c++)
+- af->data[c][i] = ((int16_t *)frame.data[0])[(i + si) * channels + c];
+- break;
+- case AV_SAMPLE_FMT_FLTP:
+- for (gint i = 0; i < sample_count; i++)
+- for (gint c = 0; c < channels; c++)
+- {
+- af->data[c][i] = ((float *)frame.data[c])[i + si];
+- }
+- break;
+- case AV_SAMPLE_FMT_S16:
+- for (gint i = 0; i < sample_count; i++)
+- for (gint c = 0; c < channels; c++)
+- af->data[c][i] = ((int16_t *)frame.data[0])[(i + si) * channels + c] / 32768.0;
+- break;
+- case AV_SAMPLE_FMT_S16P:
+- for (gint i = 0; i < sample_count; i++)
+- for (gint c = 0; c < channels; c++)
+- af->data[c][i] = ((int16_t *)frame.data[c])[i + si] / 32768.0;
+- break;
+- case AV_SAMPLE_FMT_S32:
+- for (gint i = 0; i < sample_count; i++)
+- for (gint c = 0; c < channels; c++)
+- af->data[c][i] = ((int32_t *)frame.data[0])[(i + si) * channels + c] / 2147483648.0;
+- break;
+- case AV_SAMPLE_FMT_S32P:
+- for (gint i = 0; i < sample_count; i++)
+- for (gint c = 0; c < channels; c++)
+- af->data[c][i] = ((int32_t *)frame.data[c])[i + si] / 2147483648.0;
+ break;
+- default:
+- g_warning ("undealt with sample format\n");
+ }
+- gegl_audio_fragment_set_sample_count (af, sample_count);
+- gegl_audio_fragment_set_pos (af,
+- (long int)av_rescale_q ((pkt.pts), p->audio_stream->time_base, AV_TIME_BASE_Q) * o->audio_sample_rate /AV_TIME_BASE);
+-
+- p->audio_pos += sample_count;
+- p->audio_track = g_list_append (p->audio_track, af);
+-
+- samples_left -= sample_count;
+- si += sample_count;
+- }
+- p->prevapts = pkt.pts * av_q2d (p->audio_stream->time_base);
+- }
++ int samples_left = frame.nb_samples;
++ int si = 0;
++
++ while (samples_left)
++ {
++ int sample_count = samples_left;
++ int channels = MIN(p->audio_stream->codecpar->channels, GEGL_MAX_AUDIO_CHANNELS);
++ GeglAudioFragment *af = gegl_audio_fragment_new (o->audio_sample_rate, channels,
++ AV_CH_LAYOUT_STEREO, samples_left);
++ //);
++ switch (p->audio_ctx->sample_fmt)
++ {
++ case AV_SAMPLE_FMT_FLT:
++ for (gint i = 0; i < sample_count; i++)
++ for (gint c = 0; c < channels; c++)
++ af->data[c][i] = ((int16_t *)frame.data[0])[(i + si) * channels + c];
++ break;
++ case AV_SAMPLE_FMT_FLTP:
++ for (gint i = 0; i < sample_count; i++)
++ for (gint c = 0; c < channels; c++)
++ {
++ af->data[c][i] = ((float *)frame.data[c])[i + si];
++ }
++ break;
++ case AV_SAMPLE_FMT_S16:
++ for (gint i = 0; i < sample_count; i++)
++ for (gint c = 0; c < channels; c++)
++ af->data[c][i] = ((int16_t *)frame.data[0])[(i + si) * channels + c] / 32768.0;
++ break;
++ case AV_SAMPLE_FMT_S16P:
++ for (gint i = 0; i < sample_count; i++)
++ for (gint c = 0; c < channels; c++)
++ af->data[c][i] = ((int16_t *)frame.data[c])[i + si] / 32768.0;
++ break;
++ case AV_SAMPLE_FMT_S32:
++ for (gint i = 0; i < sample_count; i++)
++ for (gint c = 0; c < channels; c++)
++ af->data[c][i] = ((int32_t *)frame.data[0])[(i + si) * channels + c] / 2147483648.0;
++ break;
++ case AV_SAMPLE_FMT_S32P:
++ for (gint i = 0; i < sample_count; i++)
++ for (gint c = 0; c < channels; c++)
++ af->data[c][i] = ((int32_t *)frame.data[c])[i + si] / 2147483648.0;
++ break;
++ default:
++ g_warning ("undealt with sample format\n");
++ }
++ gegl_audio_fragment_set_sample_count (af, sample_count);
++ gegl_audio_fragment_set_pos (
++ af,
++ (long int)av_rescale_q (
++ (pkt.pts),
++ p->audio_stream->time_base,
++ AV_TIME_BASE_Q
++ ) * o->audio_sample_rate / AV_TIME_BASE
++ );
++
++ p->audio_pos += sample_count;
++ p->audio_track = g_list_append (p->audio_track, af);
++
++ samples_left -= sample_count;
++ si += sample_count;
++ }
++ p->prevapts = pkt.pts * av_q2d (p->audio_stream->time_base);
++ }
+ }
+ av_packet_unref (&pkt);
+ }
+@@ -351,7 +358,7 @@ decode_frame (GeglOperation *operation,
+ int got_picture = 0;
+ do
+ {
+- int decoded_bytes;
++ int ret;
+ AVPacket pkt = {0,};
+
+ do
+@@ -365,42 +372,46 @@ decode_frame (GeglOperation *operation,
+ }
+ while (pkt.stream_index != p->video_index);
+
+- decoded_bytes = avcodec_send_packet (p->video_ctx, &pkt);
+- if (decoded_bytes < 0)
++ ret = avcodec_send_packet (p->video_ctx, &pkt);
++ if (ret < 0)
+ {
+ fprintf (stderr, "avcodec_send_packet failed for %s\n",
+ o->path);
+ return -1;
+ }
+- else
++ while (ret == 0)
+ {
+- decoded_bytes = avcodec_receive_frame (p->video_ctx, p->lavc_frame);
+- if (decoded_bytes < 0)
++ ret = avcodec_receive_frame (p->video_ctx, p->lavc_frame);
++ if (ret == AVERROR(EAGAIN))
++ {
++ // no more frames; should send the next packet now
++ ret = 0;
++ break;
++ }
++ else if (ret < 0)
+ {
+ fprintf (stderr, "avcodec_receive_frame failed for %s\n",
+ o->path);
++ break;
++ }
++ got_picture = 1;
++ if ((pkt.dts == pkt.pts) || (p->lavc_frame->key_frame!=0))
++ {
++ p->lavc_frame->pts = (p->video_stream->cur_dts -
++ p->video_stream->first_dts);
++ p->prevpts = av_rescale_q (p->lavc_frame->pts,
++ p->video_stream->time_base,
++ AV_TIME_BASE_Q) * 1.0 / AV_TIME_BASE;
++ decodeframe = roundf( p->prevpts * o->frame_rate);
+ }
+ else
+- got_picture = 1;
++ {
++ p->prevpts += 1.0 / o->frame_rate;
++ decodeframe = roundf ( p->prevpts * o->frame_rate);
++ }
++ if (decodeframe > frame + p->codec_delay)
++ break;
+ }
+-
+- if(got_picture)
+- {
+- if ((pkt.dts == pkt.pts) || (p->lavc_frame->key_frame!=0))
+- {
+- p->lavc_frame->pts = (p->video_stream->cur_dts -
+- p->video_stream->first_dts);
+- p->prevpts = av_rescale_q (p->lavc_frame->pts,
+- p->video_stream->time_base,
+- AV_TIME_BASE_Q) * 1.0 / AV_TIME_BASE;
+- decodeframe = roundf( p->prevpts * o->frame_rate);
+- }
+- else
+- {
+- p->prevpts += 1.0 / o->frame_rate;
+- decodeframe = roundf ( p->prevpts * o->frame_rate);
+- }
+- }
+ #if 0
+ if (decoded_bytes != pkt.size)
+ fprintf (stderr, "bytes left!\n");
+diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
+index 23efb08..cbd2957 100644
+--- a/operations/external/ff-save.c
++++ b/operations/external/ff-save.c
+@@ -413,16 +413,10 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st,
+ AVCodecContext *c = p->audio_ctx;
+ long i;
+ int ret;
+- int got_packet = 0;
+ static AVPacket pkt = { 0 }; /* XXX: static, should be stored in instance somehow */
+ AVFrame *frame = alloc_audio_frame (c->sample_fmt, c->channel_layout,
+ c->sample_rate, frame_size);
+
+- if (pkt.size == 0)
+- {
+- av_init_packet (&pkt);
+- }
+-
+ av_frame_make_writable (frame);
+ switch (c->sample_fmt) {
+ case AV_SAMPLE_FMT_FLT:
+@@ -491,25 +485,29 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st,
+ {
+ fprintf (stderr, "avcodec_send_frame failed: %s\n", av_err2str (ret));
+ }
+- else
++ while (ret == 0)
+ {
++ if (pkt.size == 0)
++ {
++ av_init_packet (&pkt);
++ }
+ ret = avcodec_receive_packet (c, &pkt);
+- if (ret < 0)
++ if (ret == AVERROR(EAGAIN))
++ {
++ // no more packets; should send the next frame now
++ }
++ else if (ret < 0)
+ {
+ fprintf (stderr, "avcodec_receive_packet failed: %s\n", av_err2str (ret));
+ }
+ else
+ {
+- got_packet = 1;
++ av_packet_rescale_ts (&pkt, c->time_base, st->time_base);
++ pkt.stream_index = st->index;
++ av_interleaved_write_frame (oc, &pkt);
++ av_packet_unref (&pkt);
+ }
+ }
+- if (got_packet)
+- {
+- av_packet_rescale_ts (&pkt, c->time_base, st->time_base);
+- pkt.stream_index = st->index;
+- av_interleaved_write_frame (oc, &pkt);
+- av_packet_unref (&pkt);
+- }
+ av_frame_free (&frame);
+ p->audio_read_pos += frame_size;
+ }
+@@ -878,23 +876,32 @@ write_video_frame (GeglProperties *o,
+ else
+ #endif
+ {
+- /* encode the image */
+- AVPacket pkt2;
+ int got_packet = 0;
+- av_init_packet(&pkt2);
+- pkt2.data = p->video_outbuf;
+- pkt2.size = p->video_outbuf_size;
+-
+- out_size = avcodec_send_frame (c, picture_ptr);
+- if (!out_size)
++ int key_frame = 0;
++ ret = avcodec_send_frame (c, picture_ptr);
++ while (ret == 0)
+ {
+- out_size = avcodec_receive_packet (c, &pkt2);
+- if (!out_size)
++ /* encode the image */
++ AVPacket pkt2;
++ av_init_packet(&pkt2);
++ // pkt2 will use its own buffer
++ // we may remove video_outbuf and video_outbuf_size too
++ //pkt2.data = p->video_outbuf;
++ //pkt2.size = p->video_outbuf_size;
++ ret = avcodec_receive_packet (c, &pkt2);
++ if (ret == AVERROR(EAGAIN))
+ {
+- got_packet = 1;
++ // no more packets
++ ret = 0;
++ break;
+ }
+- }
+-
++ else if (ret < 0)
++ {
++ break;
++ }
++ // out_size = 0;
++ got_packet = 1;
++ key_frame = !!(pkt2.flags & AV_PKT_FLAG_KEY);
+ if (!out_size && got_packet && c->coded_frame)
+ {
+ c->coded_frame->pts = pkt2.pts;
+@@ -902,38 +909,31 @@ write_video_frame (GeglProperties *o,
+ if (c->codec->capabilities & AV_CODEC_CAP_INTRA_ONLY)
+ c->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+ }
+-
+- if (pkt2.side_data_elems > 0)
+- {
+- int i;
+- for (i = 0; i < pkt2.side_data_elems; i++)
+- av_free(pkt2.side_data[i].data);
+- av_freep(&pkt2.side_data);
+- pkt2.side_data_elems = 0;
+- }
+-
+- if (!out_size)
+- out_size = pkt2.size;
+-
+- /* if zero size, it means the image was buffered */
+- if (out_size != 0)
+- {
+- AVPacket pkt;
+- av_init_packet (&pkt);
+- if (c->coded_frame->key_frame)
+- pkt.flags |= AV_PKT_FLAG_KEY;
+- pkt.stream_index = st->index;
+- pkt.data = p->video_outbuf;
+- pkt.size = out_size;
+- pkt.pts = picture_ptr->pts;
+- pkt.dts = picture_ptr->pts;
+- av_packet_rescale_ts (&pkt, c->time_base, st->time_base);
+- /* write the compressed frame in the media file */
+- ret = av_write_frame (oc, &pkt);
+- }
+- else
+- {
+- ret = 0;
++ if (pkt2.side_data_elems > 0)
++ {
++ int i;
++ for (i = 0; i < pkt2.side_data_elems; i++)
++ av_free(pkt2.side_data[i].data);
++ av_freep(&pkt2.side_data);
++ pkt2.side_data_elems = 0;
++ }
++ out_size = pkt2.size;
++ /* if zero size, it means the image was buffered */
++ if (out_size != 0)
++ {
++ AVPacket pkt;
++ av_init_packet (&pkt);
++ if (key_frame)
++ pkt.flags |= AV_PKT_FLAG_KEY;
++ pkt.stream_index = st->index;
++ pkt.data = pkt2.data;
++ pkt.size = out_size;
++ pkt.pts = picture_ptr->pts;
++ pkt.dts = picture_ptr->pts;
++ av_packet_rescale_ts (&pkt, c->time_base, st->time_base);
++ /* write the compressed frame in the media file */
++ ret = av_write_frame (oc, &pkt);
++ }
+ }
+ }
+ if (ret != 0)
+@@ -1045,38 +1045,36 @@ static void flush_audio (GeglProperties *o)
+ {
+ Priv *p = (Priv*)o->user_data;
+ AVPacket pkt = { 0 };
+- int ret;
++ int ret = 0;
+
+- int got_packet = 0;
+ if (!p->audio_st)
+ return;
+
+- got_packet = 0;
+- av_init_packet (&pkt);
+ ret = avcodec_send_frame (p->audio_ctx, NULL);
+ if (ret < 0)
+- {
+- fprintf (stderr, "avcodec_send_frame failed\n");
+- }
+- else
++ {
++ fprintf (stderr, "avcodec_send_frame failed while entering to draining mode: %s\n", av_err2str (ret));
++ }
++ av_init_packet (&pkt);
++ while (ret == 0)
+ {
+ ret = avcodec_receive_packet (p->audio_ctx, &pkt);
+- if (ret < 0)
++ if (ret == AVERROR_EOF)
++ {
++ // no more packets
++ }
++ else if (ret < 0)
+ {
+- fprintf (stderr, "avcodec_receive_packet failed\n");
++ fprintf (stderr, "avcodec_receive_packet failed: %s\n", av_err2str (ret));
+ }
+ else
+ {
+- got_packet = 1;
++ pkt.stream_index = p->audio_st->index;
++ av_packet_rescale_ts (&pkt, p->audio_ctx->time_base, p->audio_st->time_base);
++ av_interleaved_write_frame (p->oc, &pkt);
++ av_packet_unref (&pkt);
+ }
+ }
+- if (got_packet)
+- {
+- pkt.stream_index = p->audio_st->index;
+- av_packet_rescale_ts (&pkt, p->audio_ctx->time_base, p->audio_st->time_base);
+- av_interleaved_write_frame (p->oc, &pkt);
+- av_packet_unref (&pkt);
+- }
+ }
+
+ static gboolean
+@@ -1122,31 +1120,35 @@ process (GeglOperation *operation,
+ static void flush_video (GeglProperties *o)
+ {
+ Priv *p = (Priv*)o->user_data;
+- int got_packet = 0;
+ long ts = p->frame_count;
+- do {
+- AVPacket pkt = { 0 };
+- int ret;
+- got_packet = 0;
+- av_init_packet (&pkt);
+- ret = avcodec_send_frame (p->video_ctx, NULL);
+- if (ret < 0)
+- return;
+- ret = avcodec_receive_packet (p->video_ctx, &pkt);
+- if (ret < 0)
+- return;
+- got_packet = 1;
+-
+- if (got_packet)
+- {
+- pkt.stream_index = p->video_st->index;
+- pkt.pts = ts;
+- pkt.dts = ts++;
+- av_packet_rescale_ts (&pkt, p->video_ctx->time_base, p->video_st->time_base);
+- av_interleaved_write_frame (p->oc, &pkt);
+- av_packet_unref (&pkt);
+- }
+- } while (got_packet);
++ AVPacket pkt = { 0 };
++ int ret = 0;
++ ret = avcodec_send_frame (p->video_ctx, NULL);
++ if (ret < 0)
++ {
++ fprintf (stderr, "avcodec_send_frame failed while entering to draining mode: %s\n", av_err2str (ret));
++ }
++ av_init_packet (&pkt);
++ while (ret == 0)
++ {
++ ret = avcodec_receive_packet (p->video_ctx, &pkt);
++ if (ret == AVERROR_EOF)
++ {
++ // no more packets
++ }
++ else if (ret < 0)
++ {
++ }
++ else
++ {
++ pkt.stream_index = p->video_st->index;
++ pkt.pts = ts;
++ pkt.dts = ts++;
++ av_packet_rescale_ts (&pkt, p->video_ctx->time_base, p->video_st->time_base);
++ av_interleaved_write_frame (p->oc, &pkt);
++ av_packet_unref (&pkt);
++ }
++ }
+ }
+
+ static void
diff -Nru gegl-0.4.36/debian/patches/Do-not-override-const-AVOutputFormat-fields-fetched-by-av.patch gegl-0.4.36/debian/patches/Do-not-override-const-AVOutputFormat-fields-fetched-by-av.patch
--- gegl-0.4.36/debian/patches/Do-not-override-const-AVOutputFormat-fields-fetched-by-av.patch 1970-01-01 01:00:00.000000000 +0100
+++ gegl-0.4.36/debian/patches/Do-not-override-const-AVOutputFormat-fields-fetched-by-av.patch 2022-06-23 19:06:20.000000000 +0200
@@ -0,0 +1,108 @@
+From: Behnam Momeni <sbmom...@gmail.com>
+Date: Tue, 22 Mar 2022 14:43:03 +0430
+Subject: Do not override const AVOutputFormat fields fetched by
+ av_guess_format
+
+---
+ operations/external/ff-save.c | 36 +++++++++++++++++++++---------------
+ 1 file changed, 21 insertions(+), 15 deletions(-)
+
+diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
+index f6edd39..320ad02 100644
+--- a/operations/external/ff-save.c
++++ b/operations/external/ff-save.c
+@@ -951,17 +951,18 @@ tfile (GeglProperties *o)
+ {
+ Priv *p = (Priv*)o->user_data;
+
++ const AVOutputFormat *shared_fmt;
+ if (strcmp (o->container_format, "auto"))
+- p->fmt = av_guess_format (o->container_format, o->path, NULL);
++ shared_fmt = av_guess_format (o->container_format, o->path, NULL);
+ else
+- p->fmt = av_guess_format (NULL, o->path, NULL);
++ shared_fmt = av_guess_format (NULL, o->path, NULL);
+
+- if (!p->fmt)
++ if (!shared_fmt)
+ {
+ fprintf (stderr,
+ "ff_save couldn't deduce outputformat from file extension: using MPEG.\n%s",
+ "");
+- p->fmt = av_guess_format ("mpeg", NULL, NULL);
++ shared_fmt = av_guess_format ("mpeg", NULL, NULL);
+ }
+ p->oc = avformat_alloc_context ();
+ if (!p->oc)
+@@ -970,20 +971,20 @@ tfile (GeglProperties *o)
+ return -1;
+ }
+
+- p->oc->oformat = p->fmt;
+-
+ // The "avio_open" below fills "url" field instead of the "filename"
+ // snprintf (p->oc->filename, sizeof (p->oc->filename), "%s", o->path);
+
+ p->video_st = NULL;
+ p->audio_st = NULL;
+
++ enum AVCodecID audio_codec = shared_fmt->audio_codec;
++ enum AVCodecID video_codec = shared_fmt->video_codec;
+ if (strcmp (o->video_codec, "auto"))
+ {
+ const AVCodec *codec = avcodec_find_encoder_by_name (o->video_codec);
+- p->fmt->video_codec = AV_CODEC_ID_NONE;
++ video_codec = AV_CODEC_ID_NONE;
+ if (codec)
+- p->fmt->video_codec = codec->id;
++ video_codec = codec->id;
+ else
+ {
+ fprintf (stderr, "didn't find video encoder \"%s\"\navailable codecs: ", o->video_codec);
+@@ -998,9 +999,9 @@ tfile (GeglProperties *o)
+ if (strcmp (o->audio_codec, "auto"))
+ {
+ const AVCodec *codec = avcodec_find_encoder_by_name (o->audio_codec);
+- p->fmt->audio_codec = AV_CODEC_ID_NONE;
++ audio_codec = AV_CODEC_ID_NONE;
+ if (codec)
+- p->fmt->audio_codec = codec->id;
++ audio_codec = codec->id;
+ else
+ {
+ fprintf (stderr, "didn't find audio encoder \"%s\"\navailable codecs: ", o->audio_codec);
+@@ -1012,17 +1013,21 @@ tfile (GeglProperties *o)
+ fprintf (stderr, "\n");
+ }
+ }
++ p->fmt = av_malloc (sizeof(AVOutputFormat));
++ *(p->fmt) = *shared_fmt;
++ p->fmt->video_codec = video_codec;
++ p->fmt->audio_codec = audio_codec;
++ p->oc->oformat = p->fmt;
+
+- if (p->fmt->video_codec != AV_CODEC_ID_NONE)
++ if (video_codec != AV_CODEC_ID_NONE)
+ {
+- p->video_st = add_video_stream (o, p->oc, p->fmt->video_codec);
++ p->video_st = add_video_stream (o, p->oc, video_codec);
+ }
+- if (p->fmt->audio_codec != AV_CODEC_ID_NONE)
++ if (audio_codec != AV_CODEC_ID_NONE)
+ {
+- p->audio_st = add_audio_stream (o, p->oc, p->fmt->audio_codec);
++ p->audio_st = add_audio_stream (o, p->oc, audio_codec);
+ }
+
+-
+ if (p->video_st && ! open_video (o, p->oc, p->video_st))
+ return -1;
+
+@@ -1178,6 +1183,7 @@ finalize (GObject *object)
+ }
+
+ avio_closep (&p->oc->pb);
++ av_freep (&p->fmt);
+ avformat_free_context (p->oc);
+
+ g_clear_pointer (&o->user_data, g_free);
diff -Nru gegl-0.4.36/debian/patches/Replace-avcodec_decode_-with-avcodec_send_packet-avcodec_.patch gegl-0.4.36/debian/patches/Replace-avcodec_decode_-with-avcodec_send_packet-avcodec_.patch
--- gegl-0.4.36/debian/patches/Replace-avcodec_decode_-with-avcodec_send_packet-avcodec_.patch 1970-01-01 01:00:00.000000000 +0100
+++ gegl-0.4.36/debian/patches/Replace-avcodec_decode_-with-avcodec_send_packet-avcodec_.patch 2022-06-23 19:06:20.000000000 +0200
@@ -0,0 +1,70 @@
+From: Behnam Momeni <sbmom...@gmail.com>
+Date: Fri, 4 Mar 2022 20:25:50 +0330
+Subject: Replace avcodec_decode_* with
+ avcodec_send_packet/avcodec_receive_frame
+
+---
+ operations/external/ff-load.c | 34 ++++++++++++++++++++++++++--------
+ 1 file changed, 26 insertions(+), 8 deletions(-)
+
+diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
+index 8327ad4..c8889f3 100644
+--- a/operations/external/ff-load.c
++++ b/operations/external/ff-load.c
+@@ -223,14 +223,23 @@ decode_audio (GeglOperation *operation,
+ static AVFrame frame;
+ int got_frame;
+
+- decoded_bytes = avcodec_decode_audio4(p->audio_ctx,
+- &frame, &got_frame, &pkt);
+-
++ decoded_bytes = avcodec_send_packet (p->audio_ctx, &pkt);
+ if (decoded_bytes < 0)
+ {
+- fprintf (stderr, "avcodec_decode_audio4 failed for %s\n",
++ fprintf (stderr, "avcodec_send_packet failed for %s\n",
+ o->path);
+ }
++ else
++ {
++ decoded_bytes = avcodec_receive_frame (p->audio_ctx, &frame);
++ if (decoded_bytes < 0)
++ {
++ fprintf (stderr, "avcodec_receive_frame failed for %s\n",
++ o->path);
++ }
++ else
++ got_frame = 1;
++ }
+
+ if (got_frame) {
+ int samples_left = frame.nb_samples;
+@@ -356,15 +365,24 @@ decode_frame (GeglOperation *operation,
+ }
+ while (pkt.stream_index != p->video_index);
+
+- decoded_bytes = avcodec_decode_video2 (
+- p->video_ctx, p->lavc_frame,
+- &got_picture, &pkt);
++ decoded_bytes = avcodec_send_packet (p->video_ctx, &pkt);
+ if (decoded_bytes < 0)
+ {
+- fprintf (stderr, "avcodec_decode_video failed for %s\n",
++ fprintf (stderr, "avcodec_send_packet failed for %s\n",
+ o->path);
+ return -1;
+ }
++ else
++ {
++ decoded_bytes = avcodec_receive_frame (p->video_ctx, p->lavc_frame);
++ if (decoded_bytes < 0)
++ {
++ fprintf (stderr, "avcodec_receive_frame failed for %s\n",
++ o->path);
++ }
++ else
++ got_picture = 1;
++ }
+
+ if(got_picture)
+ {
diff -Nru gegl-0.4.36/debian/patches/Replace-avcodec_encode_-with-avcodec_send_frame-avcodec_r.patch gegl-0.4.36/debian/patches/Replace-avcodec_encode_-with-avcodec_send_frame-avcodec_r.patch
--- gegl-0.4.36/debian/patches/Replace-avcodec_encode_-with-avcodec_send_frame-avcodec_r.patch 1970-01-01 01:00:00.000000000 +0100
+++ gegl-0.4.36/debian/patches/Replace-avcodec_encode_-with-avcodec_send_frame-avcodec_r.patch 2022-06-23 19:06:20.000000000 +0200
@@ -0,0 +1,101 @@
+From: Behnam Momeni <sbmom...@gmail.com>
+Date: Fri, 4 Mar 2022 20:27:23 +0330
+Subject: Replace avcodec_encode_* with
+ avcodec_send_frame/avcodec_receive_packet
+
+---
+ operations/external/ff-save.c | 55 +++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 45 insertions(+), 10 deletions(-)
+
+diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
+index 4b35515..23efb08 100644
+--- a/operations/external/ff-save.c
++++ b/operations/external/ff-save.c
+@@ -486,12 +486,23 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st,
+ frame->pts = p->next_apts;
+ p->next_apts += frame_size;
+
+- //ret = avcodec_send_frame (c, frame);
+- ret = avcodec_encode_audio2 (c, &pkt, frame, &got_packet);
+-
+- if (ret < 0) {
+- fprintf (stderr, "Error encoding audio frame: %s\n", av_err2str (ret));
+- }
++ ret = avcodec_send_frame (c, frame);
++ if (ret < 0)
++ {
++ fprintf (stderr, "avcodec_send_frame failed: %s\n", av_err2str (ret));
++ }
++ else
++ {
++ ret = avcodec_receive_packet (c, &pkt);
++ if (ret < 0)
++ {
++ fprintf (stderr, "avcodec_receive_packet failed: %s\n", av_err2str (ret));
++ }
++ else
++ {
++ got_packet = 1;
++ }
++ }
+ if (got_packet)
+ {
+ av_packet_rescale_ts (&pkt, c->time_base, st->time_base);
+@@ -874,7 +885,15 @@ write_video_frame (GeglProperties *o,
+ pkt2.data = p->video_outbuf;
+ pkt2.size = p->video_outbuf_size;
+
+- out_size = avcodec_encode_video2(c, &pkt2, picture_ptr, &got_packet);
++ out_size = avcodec_send_frame (c, picture_ptr);
++ if (!out_size)
++ {
++ out_size = avcodec_receive_packet (c, &pkt2);
++ if (!out_size)
++ {
++ got_packet = 1;
++ }
++ }
+
+ if (!out_size && got_packet && c->coded_frame)
+ {
+@@ -1034,11 +1053,23 @@ static void flush_audio (GeglProperties *o)
+
+ got_packet = 0;
+ av_init_packet (&pkt);
+- ret = avcodec_encode_audio2 (p->audio_ctx, &pkt, NULL, &got_packet);
++ ret = avcodec_send_frame (p->audio_ctx, NULL);
+ if (ret < 0)
+ {
+- fprintf (stderr, "audio enc trouble\n");
++ fprintf (stderr, "avcodec_send_frame failed\n");
+ }
++ else
++ {
++ ret = avcodec_receive_packet (p->audio_ctx, &pkt);
++ if (ret < 0)
++ {
++ fprintf (stderr, "avcodec_receive_packet failed\n");
++ }
++ else
++ {
++ got_packet = 1;
++ }
++ }
+ if (got_packet)
+ {
+ pkt.stream_index = p->audio_st->index;
+@@ -1098,9 +1129,13 @@ static void flush_video (GeglProperties *o)
+ int ret;
+ got_packet = 0;
+ av_init_packet (&pkt);
+- ret = avcodec_encode_video2 (p->video_ctx, &pkt, NULL, &got_packet);
++ ret = avcodec_send_frame (p->video_ctx, NULL);
++ if (ret < 0)
++ return;
++ ret = avcodec_receive_packet (p->video_ctx, &pkt);
+ if (ret < 0)
+ return;
++ got_packet = 1;
+
+ if (got_packet)
+ {
diff -Nru gegl-0.4.36/debian/patches/Replace-deprecated-avpicture_get_size-avpicture_fill-and-.patch gegl-0.4.36/debian/patches/Replace-deprecated-avpicture_get_size-avpicture_fill-and-.patch
--- gegl-0.4.36/debian/patches/Replace-deprecated-avpicture_get_size-avpicture_fill-and-.patch 1970-01-01 01:00:00.000000000 +0100
+++ gegl-0.4.36/debian/patches/Replace-deprecated-avpicture_get_size-avpicture_fill-and-.patch 2022-06-23 19:06:20.000000000 +0200
@@ -0,0 +1,54 @@
+From: Behnam Momeni <sbmom...@gmail.com>
+Date: Fri, 4 Mar 2022 20:38:31 +0330
+Subject: Replace deprecated avpicture_get_size, avpicture_fill,
+ and av_codec_next
+
+The avpicture_get_size is replaced by av_image_get_buffer_size.
+The avpicture_fill is replaced by av_image_fill_arrays.
+The av_codec_next is replaced by av_codec_iterate.
+---
+ operations/external/ff-save.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
+index cbd2957..a34f9fa 100644
+--- a/operations/external/ff-save.c
++++ b/operations/external/ff-save.c
+@@ -626,14 +626,15 @@ alloc_picture (int pix_fmt, int width, int height)
+ picture = av_frame_alloc ();
+ if (!picture)
+ return NULL;
+- size = avpicture_get_size (pix_fmt, width + 1, height + 1);
++ size = av_image_get_buffer_size(pix_fmt, width + 1, height + 1, 1);
+ picture_buf = malloc (size);
+ if (!picture_buf)
+ {
+ av_free (picture);
+ return NULL;
+ }
+- avpicture_fill ((AVPicture *) picture, picture_buf, pix_fmt, width, height);
++ av_image_fill_arrays (picture->data, picture->linesize,
++ picture_buf, pix_fmt, width, height, 1);
+ return picture;
+ }
+
+@@ -984,7 +985,8 @@ tfile (GeglProperties *o)
+ else
+ {
+ fprintf (stderr, "didn't find video encoder \"%s\"\navailable codecs: ", o->video_codec);
+- while ((codec = av_codec_next (codec)))
++ void *opaque = NULL;
++ while ((codec = av_codec_iterate (&opaque)))
+ if (av_codec_is_encoder (codec) &&
+ avcodec_get_type (codec->id) == AVMEDIA_TYPE_VIDEO)
+ fprintf (stderr, "%s ", codec->name);
+@@ -1000,7 +1002,8 @@ tfile (GeglProperties *o)
+ else
+ {
+ fprintf (stderr, "didn't find audio encoder \"%s\"\navailable codecs: ", o->audio_codec);
+- while ((codec = av_codec_next (codec)))
++ void *opaque = NULL;
++ while ((codec = av_codec_iterate (&opaque)))
+ if (av_codec_is_encoder (codec) &&
+ avcodec_get_type (codec->id) == AVMEDIA_TYPE_AUDIO)
+ fprintf (stderr, "%s ", codec->name);
diff -Nru gegl-0.4.36/debian/patches/Replace-deprecated-AVStream-codec-usages-with-a-separate-.patch gegl-0.4.36/debian/patches/Replace-deprecated-AVStream-codec-usages-with-a-separate-.patch
--- gegl-0.4.36/debian/patches/Replace-deprecated-AVStream-codec-usages-with-a-separate-.patch 1970-01-01 01:00:00.000000000 +0100
+++ gegl-0.4.36/debian/patches/Replace-deprecated-AVStream-codec-usages-with-a-separate-.patch 2022-06-23 19:06:20.000000000 +0200
@@ -0,0 +1,648 @@
+From: Behnam Momeni <sbmom...@gmail.com>
+Date: Fri, 4 Mar 2022 20:16:55 +0330
+Subject: Replace deprecated AVStream::codec usages with a separate
+ AVCodecContext
+
+Two AVCodecContext objects are created, one for audio stream and one for
+video stream. When the audio_st/video_st are created, parameters are
+stored in the AVCodecParameters (i.e., codecpar fields) and then they
+are moved to the AVCodecContext instances in open_audio/open_video
+functions. Some fields must be set directly on the AVCodecContext and
+have no counterpart in the AVCodecParameters. Initialization of those
+fields is postponed to the open_* functions too.
+---
+ operations/external/ff-load.c | 62 ++++++----
+ operations/external/ff-save.c | 279 +++++++++++++++++++++++-------------------
+ 2 files changed, 194 insertions(+), 147 deletions(-)
+
+diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
+index c40b705..8327ad4 100644
+--- a/operations/external/ff-load.c
++++ b/operations/external/ff-load.c
+@@ -92,7 +92,9 @@ typedef struct
+ AVFormatContext *video_fcontext;
+ int video_index;
+ AVStream *video_stream;
++ AVCodecContext *video_ctx;
+ AVStream *audio_stream;
++ AVCodecContext *audio_ctx;
+ AVCodec *video_codec;
+ AVFrame *lavc_frame;
+ AVFrame *rgb_frame;
+@@ -142,10 +144,8 @@ ff_cleanup (GeglProperties *o)
+ {
+ clear_audio_track (o);
+ g_free (p->loadedfilename);
+- if (p->video_stream && p->video_stream->codec)
+- avcodec_close (p->video_stream->codec);
+- if (p->audio_stream && p->audio_stream->codec)
+- avcodec_close (p->audio_stream->codec);
++ avcodec_free_context (&p->video_ctx);
++ avcodec_free_context (&p->audio_ctx);
+ if (p->video_fcontext)
+ avformat_close_input(&p->video_fcontext);
+ if (p->audio_fcontext)
+@@ -204,7 +204,7 @@ decode_audio (GeglOperation *operation,
+ if (av_seek_frame (p->audio_fcontext, p->audio_stream->index, seek_target, (AVSEEK_FLAG_BACKWARD)) < 0)
+ fprintf (stderr, "audio seek error!\n");
+ else
+- avcodec_flush_buffers (p->audio_stream->codec);
++ avcodec_flush_buffers (p->audio_ctx);
+
+ }
+
+@@ -223,7 +223,7 @@ decode_audio (GeglOperation *operation,
+ static AVFrame frame;
+ int got_frame;
+
+- decoded_bytes = avcodec_decode_audio4(p->audio_stream->codec,
++ decoded_bytes = avcodec_decode_audio4(p->audio_ctx,
+ &frame, &got_frame, &pkt);
+
+ if (decoded_bytes < 0)
+@@ -243,7 +243,7 @@ decode_audio (GeglOperation *operation,
+ GeglAudioFragment *af = gegl_audio_fragment_new (o->audio_sample_rate, channels,
+ AV_CH_LAYOUT_STEREO, samples_left);
+ //);
+- switch (p->audio_stream->codec->sample_fmt)
++ switch (p->audio_ctx->sample_fmt)
+ {
+ case AV_SAMPLE_FMT_FLT:
+ for (gint i = 0; i < sample_count; i++)
+@@ -327,12 +327,12 @@ decode_frame (GeglOperation *operation,
+ if (frame < 2 || frame > prevframe + 64 || frame < prevframe )
+ {
+ int64_t seek_target = av_rescale_q (((frame) * AV_TIME_BASE * 1.0) / o->frame_rate
+-, AV_TIME_BASE_Q, p->video_stream->time_base) / p->video_stream->codec->ticks_per_frame;
++, AV_TIME_BASE_Q, p->video_stream->time_base) / p->video_ctx->ticks_per_frame;
+
+ if (av_seek_frame (p->video_fcontext, p->video_index, seek_target, (AVSEEK_FLAG_BACKWARD )) < 0)
+ fprintf (stderr, "video seek error!\n");
+ else
+- avcodec_flush_buffers (p->video_stream->codec);
++ avcodec_flush_buffers (p->video_ctx);
+
+ prevframe = -1;
+ }
+@@ -357,7 +357,7 @@ decode_frame (GeglOperation *operation,
+ while (pkt.stream_index != p->video_index);
+
+ decoded_bytes = avcodec_decode_video2 (
+- p->video_stream->codec, p->lavc_frame,
++ p->video_ctx, p->lavc_frame,
+ &got_picture, &pkt);
+ if (decoded_bytes < 0)
+ {
+@@ -469,16 +469,26 @@ prepare (GeglOperation *operation)
+ {
+ p->video_codec = avcodec_find_decoder (p->video_stream->codecpar->codec_id);
+ if (p->video_codec == NULL)
+- g_warning ("video codec not found");
+- p->video_stream->codec->err_recognition = AV_EF_IGNORE_ERR |
++ {
++ g_warning ("video codec not found");
++ p->video_ctx = NULL;
++ return;
++ }
++ p->video_ctx = avcodec_alloc_context3 (p->video_codec);
++ if (avcodec_parameters_to_context (p->video_ctx, p->video_stream->codecpar) < 0)
++ {
++ fprintf (stderr, "cannot copy video codec parameters\n");
++ return;
++ }
++ p->video_ctx->err_recognition = AV_EF_IGNORE_ERR |
+ AV_EF_BITSTREAM |
+ AV_EF_BUFFER;
+- p->video_stream->codec->workaround_bugs = FF_BUG_AUTODETECT;
++ p->video_ctx->workaround_bugs = FF_BUG_AUTODETECT;
+
+
+- if (avcodec_open2 (p->video_stream->codec, p->video_codec, NULL) < 0)
++ if (avcodec_open2 (p->video_ctx, p->video_codec, NULL) < 0)
+ {
+- g_warning ("error opening codec %s", p->video_stream->codec->codec->name);
++ g_warning ("error opening codec %s", p->video_ctx->codec->name);
+ return;
+ }
+ }
+@@ -487,10 +497,20 @@ prepare (GeglOperation *operation)
+ {
+ p->audio_codec = avcodec_find_decoder (p->audio_stream->codecpar->codec_id);
+ if (p->audio_codec == NULL)
+- g_warning ("audio codec not found");
+- else if (avcodec_open2 (p->audio_stream->codec, p->audio_codec, NULL) < 0)
+ {
+- g_warning ("error opening codec %s", p->audio_stream->codec->codec->name);
++ g_warning ("audio codec not found");
++ p->audio_ctx = NULL;
++ return;
++ }
++ p->audio_ctx = avcodec_alloc_context3 (p->audio_codec);
++ if (avcodec_parameters_to_context (p->audio_ctx, p->audio_stream->codecpar) < 0)
++ {
++ fprintf (stderr, "cannot copy audio codec parameters\n");
++ return;
++ }
++ if (avcodec_open2 (p->audio_ctx, p->audio_codec, NULL) < 0)
++ {
++ g_warning ("error opening codec %s", p->audio_ctx->codec->name);
+ }
+ else
+ {
+@@ -546,7 +566,7 @@ prepare (GeglOperation *operation)
+ fprintf (stdout, "duration: %02i:%02i:%02i\n", h, m, s);
+ }
+ #endif
+- p->codec_delay = p->video_stream->codec->delay;
++ p->codec_delay = p->video_ctx->delay;
+
+ if (!strcmp (o->video_codec, "mpeg1video"))
+ p->codec_delay = 1;
+@@ -738,7 +758,7 @@ process (GeglOperation *operation,
+ if (p->video_stream == NULL)
+ return TRUE;
+
+- if (p->video_stream->codec->pix_fmt == AV_PIX_FMT_RGB24)
++ if (p->video_ctx->pix_fmt == AV_PIX_FMT_RGB24)
+ {
+ GeglRectangle extent = {0,0,p->width,p->height};
+ gegl_buffer_set (output, &extent, 0, babl_format("R'G'B' u8"), p->lavc_frame->data[0], GEGL_AUTO_ROWSTRIDE);
+@@ -748,7 +768,7 @@ process (GeglOperation *operation,
+ struct SwsContext *img_convert_ctx;
+ GeglRectangle extent = {0,0,p->width,p->height};
+
+- img_convert_ctx = sws_getContext(p->width, p->height, p->video_stream->codec->pix_fmt,
++ img_convert_ctx = sws_getContext(p->width, p->height, p->video_ctx->pix_fmt,
+ p->width, p->height, AV_PIX_FMT_RGB24,
+ SWS_BICUBIC, NULL, NULL, NULL);
+ if (!p->rgb_frame)
+diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
+index 6e345fa..4b35515 100644
+--- a/operations/external/ff-save.c
++++ b/operations/external/ff-save.c
+@@ -108,6 +108,7 @@ typedef struct
+ AVOutputFormat *fmt;
+ AVFormatContext *oc;
+ AVStream *video_st;
++ AVCodecContext *video_ctx;
+
+ AVFrame *picture, *tmp_picture;
+ uint8_t *video_outbuf;
+@@ -119,6 +120,7 @@ typedef struct
+ * using gggl directly,. without needing to link with the oxide library
+ */
+ AVStream *audio_st;
++ AVCodecContext *audio_ctx;
+
+ uint32_t sample_rate;
+ uint32_t bits;
+@@ -284,7 +286,7 @@ static void write_audio_frame (GeglProperties *o,
+ static AVStream *
+ add_audio_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
+ {
+- AVCodecContext *c;
++ AVCodecParameters *cp;
+ AVStream *st;
+
+ st = avformat_new_stream (oc, NULL);
+@@ -294,12 +296,26 @@ add_audio_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
+ exit (1);
+ }
+
+- c = st->codec;
+- c->codec_id = codec_id;
+- c->codec_type = AVMEDIA_TYPE_AUDIO;
++ cp = st->codecpar;
++ cp->codec_id = codec_id;
++ cp->codec_type = AVMEDIA_TYPE_AUDIO;
++ cp->bit_rate = o->audio_bit_rate * 1000;
+
+- if (oc->oformat->flags & AVFMT_GLOBALHEADER)
+- c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
++ if (o->audio_sample_rate == -1)
++ {
++ if (o->audio)
++ {
++ if (gegl_audio_fragment_get_sample_rate (o->audio) == 0)
++ {
++ gegl_audio_fragment_set_sample_rate (o->audio, 48000); // XXX: should skip adding audiostream instead
++ }
++ o->audio_sample_rate = gegl_audio_fragment_get_sample_rate (o->audio);
++ }
++ }
++ cp->sample_rate = o->audio_sample_rate;
++
++ cp->channel_layout = AV_CH_LAYOUT_STEREO;
++ cp->channels = 2;
+
+ return st;
+ }
+@@ -308,49 +324,44 @@ add_audio_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
+ static gboolean
+ open_audio (GeglProperties *o, AVFormatContext * oc, AVStream * st)
+ {
++ Priv *p = (Priv*)o->user_data;
+ AVCodecContext *c;
+- AVCodec *codec;
++ AVCodecParameters *cp;
++ const AVCodec *codec;
+ int i;
+
+- c = st->codec;
++ cp = st->codecpar;
+
+ /* find the audio encoder */
+- codec = avcodec_find_encoder (c->codec_id);
++ codec = avcodec_find_encoder (cp->codec_id);
+ if (!codec)
+ {
++ p->audio_ctx = NULL;
+ fprintf (stderr, "codec not found\n");
+ return FALSE;
+ }
+- c->bit_rate = o->audio_bit_rate * 1000;
+- c->sample_fmt = codec->sample_fmts ? codec->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
+-
+- if (o->audio_sample_rate == -1)
+- {
+- if (o->audio)
++ p->audio_ctx = c = avcodec_alloc_context3 (codec);
++ cp->format = codec->sample_fmts ? codec->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
++ if (codec->supported_samplerates)
+ {
+- if (gegl_audio_fragment_get_sample_rate (o->audio) == 0)
+- {
+- gegl_audio_fragment_set_sample_rate (o->audio, 48000); // XXX: should skip adding audiostream instead
+- }
+- o->audio_sample_rate = gegl_audio_fragment_get_sample_rate (o->audio);
++ for (i = 0; codec->supported_samplerates[i]; i++)
++ {
++ if (codec->supported_samplerates[i] == cp->sample_rate)
++ break;
++ }
++ if (!codec->supported_samplerates[i])
++ cp->sample_rate = codec->supported_samplerates[0];
+ }
+- }
+- c->sample_rate = o->audio_sample_rate;
+- c->channel_layout = AV_CH_LAYOUT_STEREO;
+- c->channels = 2;
+-
+-
+- if (codec->supported_samplerates)
+- {
+- c->sample_rate = codec->supported_samplerates[0];
+- for (i = 0; codec->supported_samplerates[i]; i++)
++ if (avcodec_parameters_to_context (c, cp) < 0)
+ {
+- if (codec->supported_samplerates[i] == o->audio_sample_rate)
+- c->sample_rate = o->audio_sample_rate;
++ fprintf (stderr, "cannot copy codec parameters\n");
++ return FALSE;
+ }
+- }
+- //st->time_base = (AVRational){1, c->sample_rate};
+- st->time_base = (AVRational){1, o->audio_sample_rate};
++ if (p->oc->oformat->flags & AVFMT_GLOBALHEADER)
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
++
++ st->time_base = (AVRational){1, c->sample_rate};
++ //st->time_base = (AVRational){1, o->audio_sample_rate};
+
+ c->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; // ffmpeg AAC is not quite stable yet
+
+@@ -360,7 +371,11 @@ open_audio (GeglProperties *o, AVFormatContext * oc, AVStream * st)
+ fprintf (stderr, "could not open codec\n");
+ return FALSE;
+ }
+-
++ if (avcodec_parameters_from_context (cp, c) < 0)
++ {
++ fprintf (stderr, "cannot copy back the audio codec parameters\n");
++ return FALSE;
++ }
+ return TRUE;
+ }
+
+@@ -395,7 +410,7 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st,
+ {
+ while (p->audio_pos - p->audio_read_pos > frame_size)
+ {
+- AVCodecContext *c = st->codec;
++ AVCodecContext *c = p->audio_ctx;
+ long i;
+ int ret;
+ int got_packet = 0;
+@@ -479,7 +494,7 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st,
+ }
+ if (got_packet)
+ {
+- av_packet_rescale_ts (&pkt, st->codec->time_base, st->time_base);
++ av_packet_rescale_ts (&pkt, c->time_base, st->time_base);
+ pkt.stream_index = st->index;
+ av_interleaved_write_frame (oc, &pkt);
+ av_packet_unref (&pkt);
+@@ -494,7 +509,7 @@ void
+ write_audio_frame (GeglProperties *o, AVFormatContext * oc, AVStream * st)
+ {
+ Priv *p = (Priv*)o->user_data;
+- AVCodecContext *c = st->codec;
++ AVCodecContext *c = p->audio_ctx;
+ int sample_count = 100000;
+
+ if (o->audio)
+@@ -551,8 +566,7 @@ write_audio_frame (GeglProperties *o, AVFormatContext * oc, AVStream * st)
+ void
+ close_audio (Priv * p, AVFormatContext * oc, AVStream * st)
+ {
+- avcodec_close (st->codec);
+-
++ avcodec_free_context (&p->audio_ctx);
+ }
+
+ /* add a video output stream */
+@@ -561,7 +575,7 @@ add_video_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
+ {
+ Priv *p = (Priv*)o->user_data;
+
+- AVCodecContext *c;
++ AVCodecParameters *cp;
+ AVStream *st;
+
+ st = avformat_new_stream (oc, NULL);
+@@ -571,78 +585,23 @@ add_video_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
+ exit (1);
+ }
+
+- c = st->codec;
+- c->codec_id = codec_id;
+- c->codec_type = AVMEDIA_TYPE_VIDEO;
++ cp = st->codecpar;
++ cp->codec_id = codec_id;
++ cp->codec_type = AVMEDIA_TYPE_VIDEO;
+ /* put sample propeters */
+- c->bit_rate = o->video_bit_rate * 1000;
++ cp->bit_rate = o->video_bit_rate * 1000;
+ #ifdef USE_FINE_GRAINED_FFMPEG
+- c->rc_min_rate = o->video_bit_rate_min * 1000;
+- c->rc_max_rate = o->video_bit_rate_max * 1000;
++ cp->rc_min_rate = o->video_bit_rate_min * 1000;
++ cp->rc_max_rate = o->video_bit_rate_max * 1000;
+ if (o->video_bit_rate_tolerance >= 0)
+- c->bit_rate_tolerance = o->video_bit_rate_tolerance * 1000;
++ cp->bit_rate_tolerance = o->video_bit_rate_tolerance * 1000;
+ #endif
+ /* resolution must be a multiple of two */
+- c->width = p->width;
+- c->height = p->height;
++ cp->width = p->width;
++ cp->height = p->height;
+ /* frames per second */
+ st->time_base =(AVRational){1000, o->frame_rate * 1000};
+- c->time_base = st->time_base;
+-
+- c->pix_fmt = AV_PIX_FMT_YUV420P;
+-
+- if (c->codec_id == AV_CODEC_ID_MPEG2VIDEO)
+- {
+- c->max_b_frames = 2;
+- }
+-
+- if (c->codec_id == AV_CODEC_ID_H264)
+- {
+- c->qcompress = 0.6; // qcomp=0.6
+- c->me_range = 16; // me_range=16
+- c->gop_size = 250; // g=250
+- c->max_b_frames = 3; // bf=3
+- }
+-
+- if (o->video_bufsize)
+- c->rc_buffer_size = o->video_bufsize * 1000;
+-#if USE_FINE_GRAINED_FFMPEG
+- if (o->global_quality)
+- c->global_quality = o->global_quality;
+- if (o->qcompress != 0.0)
+- c->qcompress = o->qcompress;
+- if (o->qblur != 0.0)
+- c->qblur = o->qblur;
+- if (o->max_qdiff != 0)
+- c->max_qdiff = o->max_qdiff;
+- if (o->me_subpel_quality != 0)
+- c->me_subpel_quality = o->me_subpel_quality;
+- if (o->i_quant_factor != 0.0)
+- c->i_quant_factor = o->i_quant_factor;
+- if (o->i_quant_offset != 0.0)
+- c->i_quant_offset = o->i_quant_offset;
+- if (o->max_b_frames)
+- c->max_b_frames = o->max_b_frames;
+- if (o->me_range)
+- c->me_range = o->me_range;
+- if (o->noise_reduction)
+- c->noise_reduction = o->noise_reduction;
+- if (o->scenechange_threshold)
+- c->scenechange_threshold = o->scenechange_threshold;
+- if (o->trellis)
+- c->trellis = o->trellis;
+- if (o->qmin)
+- c->qmin = o->qmin;
+- if (o->qmax)
+- c->qmax = o->qmax;
+- if (o->gop_size)
+- c->gop_size = o->gop_size;
+- if (o->keyint_min)
+- c->keyint_min = o->keyint_min;
+-#endif
+-
+- if (oc->oformat->flags & AVFMT_GLOBALHEADER)
+- c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
++ cp->format = AV_PIX_FMT_YUV420P;
+
+ return st;
+ }
+@@ -673,36 +632,99 @@ static gboolean
+ open_video (GeglProperties *o, AVFormatContext * oc, AVStream * st)
+ {
+ Priv *p = (Priv*)o->user_data;
+- AVCodec *codec;
++ const AVCodec *codec;
+ AVCodecContext *c;
++ AVCodecParameters *cp;
+ AVDictionary *codec_options = {0};
+ int ret;
+
+- c = st->codec;
++ cp = st->codecpar;
+
+ /* find the video encoder */
+- codec = avcodec_find_encoder (c->codec_id);
++ codec = avcodec_find_encoder (cp->codec_id);
+ if (!codec)
+ {
++ p->video_ctx = NULL;
+ fprintf (stderr, "codec not found\n");
+ return FALSE;
+ }
+-
+- if (codec->pix_fmts){
+- int i = 0;
+- c->pix_fmt = codec->pix_fmts[0];
+- while (codec->pix_fmts[i] !=-1)
++ p->video_ctx = c = avcodec_alloc_context3 (codec);
++ if (codec->pix_fmts)
+ {
+- if (codec->pix_fmts[i] == AV_PIX_FMT_RGB24)
+- c->pix_fmt = AV_PIX_FMT_RGB24;
+- i++;
++ int i = 0;
++ cp->format = codec->pix_fmts[0];
++ while (codec->pix_fmts[i] != -1)
++ {
++ if (codec->pix_fmts[i] == AV_PIX_FMT_RGB24)
++ {
++ cp->format = AV_PIX_FMT_RGB24;
++ break;
++ }
++ i++;
++ }
+ }
+- }
++ if (avcodec_parameters_to_context (c, cp) < 0)
++ {
++ fprintf (stderr, "cannot copy codec parameters\n");
++ return FALSE;
++ }
++ c->time_base = st->time_base;
++ if (cp->codec_id == AV_CODEC_ID_MPEG2VIDEO)
++ {
++ c->max_b_frames = 2;
++ }
++ if (cp->codec_id == AV_CODEC_ID_H264)
++ {
++ c->qcompress = 0.6; // qcomp=0.6
++ c->me_range = 16; // me_range=16
++ c->gop_size = 250; // g=250
++ c->max_b_frames = 3; // bf=3
++ }
++ if (o->video_bufsize)
++ c->rc_buffer_size = o->video_bufsize * 1000;
++ if (p->oc->oformat->flags & AVFMT_GLOBALHEADER)
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
++
+ #if 0
+ if (o->video_preset[0])
+ av_dict_set (&codec_options, "preset", o->video_preset, 0);
+ #endif
+
++#if USE_FINE_GRAINED_FFMPEG
++ if (o->global_quality)
++ c->global_quality = o->global_quality;
++ if (o->qcompress != 0.0)
++ c->qcompress = o->qcompress;
++ if (o->qblur != 0.0)
++ c->qblur = o->qblur;
++ if (o->max_qdiff != 0)
++ c->max_qdiff = o->max_qdiff;
++ if (o->me_subpel_quality != 0)
++ c->me_subpel_quality = o->me_subpel_quality;
++ if (o->i_quant_factor != 0.0)
++ c->i_quant_factor = o->i_quant_factor;
++ if (o->i_quant_offset != 0.0)
++ c->i_quant_offset = o->i_quant_offset;
++ if (o->max_b_frames)
++ c->max_b_frames = o->max_b_frames;
++ if (o->me_range)
++ c->me_range = o->me_range;
++ if (o->noise_reduction)
++ c->noise_reduction = o->noise_reduction;
++ if (o->scenechange_threshold)
++ c->scenechange_threshold = o->scenechange_threshold;
++ if (o->trellis)
++ c->trellis = o->trellis;
++ if (o->qmin)
++ c->qmin = o->qmin;
++ if (o->qmax)
++ c->qmax = o->qmax;
++ if (o->gop_size)
++ c->gop_size = o->gop_size;
++ if (o->keyint_min)
++ c->keyint_min = o->keyint_min;
++#endif
++
+ /* open the codec */
+ if ((ret = avcodec_open2 (c, codec, &codec_options)) < 0)
+ {
+@@ -741,6 +763,11 @@ open_video (GeglProperties *o, AVFormatContext * oc, AVStream * st)
+ return FALSE;
+ }
+ }
++ if (avcodec_parameters_from_context (cp, c) < 0)
++ {
++ fprintf (stderr, "cannot copy back the video codec parameters\n");
++ return FALSE;
++ }
+
+ return TRUE;
+ }
+@@ -748,7 +775,7 @@ open_video (GeglProperties *o, AVFormatContext * oc, AVStream * st)
+ static void
+ close_video (Priv * p, AVFormatContext * oc, AVStream * st)
+ {
+- avcodec_close (st->codec);
++ avcodec_free_context (&p->video_ctx);
+ av_free (p->picture->data[0]);
+ av_free (p->picture);
+ if (p->tmp_picture)
+@@ -780,7 +807,7 @@ write_video_frame (GeglProperties *o,
+ AVCodecContext *c;
+ AVFrame *picture_ptr;
+
+- c = st->codec;
++ c = p->video_ctx;
+
+ if (c->pix_fmt != AV_PIX_FMT_RGB24)
+ {
+@@ -968,7 +995,7 @@ tfile (GeglProperties *o)
+ }
+ if (p->fmt->audio_codec != AV_CODEC_ID_NONE)
+ {
+- p->audio_st = add_audio_stream (o, p->oc, p->fmt->audio_codec);
++ p->audio_st = add_audio_stream (o, p->oc, p->fmt->audio_codec);
+ }
+
+
+@@ -1007,7 +1034,7 @@ static void flush_audio (GeglProperties *o)
+
+ got_packet = 0;
+ av_init_packet (&pkt);
+- ret = avcodec_encode_audio2 (p->audio_st->codec, &pkt, NULL, &got_packet);
++ ret = avcodec_encode_audio2 (p->audio_ctx, &pkt, NULL, &got_packet);
+ if (ret < 0)
+ {
+ fprintf (stderr, "audio enc trouble\n");
+@@ -1015,7 +1042,7 @@ static void flush_audio (GeglProperties *o)
+ if (got_packet)
+ {
+ pkt.stream_index = p->audio_st->index;
+- av_packet_rescale_ts (&pkt, p->audio_st->codec->time_base, p->audio_st->time_base);
++ av_packet_rescale_ts (&pkt, p->audio_ctx->time_base, p->audio_st->time_base);
+ av_interleaved_write_frame (p->oc, &pkt);
+ av_packet_unref (&pkt);
+ }
+@@ -1071,7 +1098,7 @@ static void flush_video (GeglProperties *o)
+ int ret;
+ got_packet = 0;
+ av_init_packet (&pkt);
+- ret = avcodec_encode_video2 (p->video_st->codec, &pkt, NULL, &got_packet);
++ ret = avcodec_encode_video2 (p->video_ctx, &pkt, NULL, &got_packet);
+ if (ret < 0)
+ return;
+
+@@ -1080,7 +1107,7 @@ static void flush_video (GeglProperties *o)
+ pkt.stream_index = p->video_st->index;
+ pkt.pts = ts;
+ pkt.dts = ts++;
+- av_packet_rescale_ts (&pkt, p->video_st->codec->time_base, p->video_st->time_base);
++ av_packet_rescale_ts (&pkt, p->video_ctx->time_base, p->video_st->time_base);
+ av_interleaved_write_frame (p->oc, &pkt);
+ av_packet_unref (&pkt);
+ }
diff -Nru gegl-0.4.36/debian/patches/Replace-first-cur-_dts-Remove-no-op-functions-unused-vars.patch gegl-0.4.36/debian/patches/Replace-first-cur-_dts-Remove-no-op-functions-unused-vars.patch
--- gegl-0.4.36/debian/patches/Replace-first-cur-_dts-Remove-no-op-functions-unused-vars.patch 1970-01-01 01:00:00.000000000 +0100
+++ gegl-0.4.36/debian/patches/Replace-first-cur-_dts-Remove-no-op-functions-unused-vars.patch 2022-06-23 19:06:20.000000000 +0200
@@ -0,0 +1,142 @@
+From: Behnam Momeni <sbmom...@gmail.com>
+Date: Fri, 4 Mar 2022 20:34:36 +0330
+Subject: Replace {first,cur}_dts + Remove no-op functions & unused vars
+
+The cur_dts and first_dts fields are moved to internal.h and the
+avformat library is supposed to use them exclusively. The cur_dts
+is the last seen packet dts, so it can be replaced by pkt.dts and
+the first_dts is the first seen packet dts, so it can be kept in
+a new p->first_dts variable after the first decoding (in video stream).
+
+The av_register_all and avcodec_register_all functions have no effect
+in the new version.
+
+The coded_frame is removed and it was used for reporting more
+information to the caller (which is not required in gegl).
+For details, check https://github.com/FFmpeg/FFmpeg/commit/11bc79089378a5ec00547d0f85bc152afdf30dfa
+
+Finally, the filename is replaced by url which is allocated dynamically
+with no size limit.
+---
+ operations/external/ff-load.c | 11 +++++++++--
+ operations/external/ff-save.c | 16 +++++++++-------
+ 2 files changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
+index 2f658dd..32d3fce 100644
+--- a/operations/external/ff-load.c
++++ b/operations/external/ff-load.c
+@@ -76,11 +76,12 @@ typedef struct
+ gint height;
+ gdouble fps;
+ gint codec_delay;
++ int64_t first_dts;
+
+ gchar *loadedfilename; /* to remember which file is "cached" */
+
+ AVFormatContext *audio_fcontext;
+- AVCodec *audio_codec;
++ const AVCodec *audio_codec;
+ int audio_index;
+ GList *audio_track;
+ long audio_cursor_pos;
+@@ -95,7 +96,7 @@ typedef struct
+ AVCodecContext *video_ctx;
+ AVStream *audio_stream;
+ AVCodecContext *audio_ctx;
+- AVCodec *video_codec;
++ const AVCodec *video_codec;
+ AVFrame *lavc_frame;
+ AVFrame *rgb_frame;
+ glong prevframe; /* previously decoded frame number */
+@@ -381,6 +382,8 @@ decode_frame (GeglOperation *operation,
+ }
+ while (ret == 0)
+ {
++ if (!p->first_dts)
++ p->first_dts = pkt.dts;
+ ret = avcodec_receive_frame (p->video_ctx, p->lavc_frame);
+ if (ret == AVERROR(EAGAIN))
+ {
+@@ -397,8 +400,12 @@ decode_frame (GeglOperation *operation,
+ got_picture = 1;
+ if ((pkt.dts == pkt.pts) || (p->lavc_frame->key_frame!=0))
+ {
++ // cur_dts and first_dts are moved to libavformat/internal.h
++ /*
+ p->lavc_frame->pts = (p->video_stream->cur_dts -
+ p->video_stream->first_dts);
++ */
++ p->lavc_frame->pts = pkt.dts - p->first_dts;
+ p->prevpts = av_rescale_q (p->lavc_frame->pts,
+ p->video_stream->time_base,
+ AV_TIME_BASE_Q) * 1.0 / AV_TIME_BASE;
+diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
+index a34f9fa..f6edd39 100644
+--- a/operations/external/ff-save.c
++++ b/operations/external/ff-save.c
+@@ -251,8 +251,6 @@ init (GeglProperties *o)
+
+ if (!inited)
+ {
+- av_register_all ();
+- avcodec_register_all ();
+ inited = 1;
+ }
+
+@@ -877,7 +875,7 @@ write_video_frame (GeglProperties *o,
+ else
+ #endif
+ {
+- int got_packet = 0;
++ // int got_packet = 0;
+ int key_frame = 0;
+ ret = avcodec_send_frame (c, picture_ptr);
+ while (ret == 0)
+@@ -901,8 +899,10 @@ write_video_frame (GeglProperties *o,
+ break;
+ }
+ // out_size = 0;
+- got_packet = 1;
++ // got_packet = 1;
+ key_frame = !!(pkt2.flags & AV_PKT_FLAG_KEY);
++ // coded_frame is removed by https://github.com/FFmpeg/FFmpeg/commit/11bc79089378a5ec00547d0f85bc152afdf30dfa
++ /*
+ if (!out_size && got_packet && c->coded_frame)
+ {
+ c->coded_frame->pts = pkt2.pts;
+@@ -910,6 +910,7 @@ write_video_frame (GeglProperties *o,
+ if (c->codec->capabilities & AV_CODEC_CAP_INTRA_ONLY)
+ c->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+ }
++ */
+ if (pkt2.side_data_elems > 0)
+ {
+ int i;
+@@ -971,14 +972,15 @@ tfile (GeglProperties *o)
+
+ p->oc->oformat = p->fmt;
+
+- snprintf (p->oc->filename, sizeof (p->oc->filename), "%s", o->path);
++ // The "avio_open" below fills "url" field instead of the "filename"
++ // snprintf (p->oc->filename, sizeof (p->oc->filename), "%s", o->path);
+
+ p->video_st = NULL;
+ p->audio_st = NULL;
+
+ if (strcmp (o->video_codec, "auto"))
+ {
+- AVCodec *codec = avcodec_find_encoder_by_name (o->video_codec);
++ const AVCodec *codec = avcodec_find_encoder_by_name (o->video_codec);
+ p->fmt->video_codec = AV_CODEC_ID_NONE;
+ if (codec)
+ p->fmt->video_codec = codec->id;
+@@ -995,7 +997,7 @@ tfile (GeglProperties *o)
+ }
+ if (strcmp (o->audio_codec, "auto"))
+ {
+- AVCodec *codec = avcodec_find_encoder_by_name (o->audio_codec);
++ const AVCodec *codec = avcodec_find_encoder_by_name (o->audio_codec);
+ p->fmt->audio_codec = AV_CODEC_ID_NONE;
+ if (codec)
+ p->fmt->audio_codec = codec->id;
diff -Nru gegl-0.4.36/debian/patches/series gegl-0.4.36/debian/patches/series
--- gegl-0.4.36/debian/patches/series 2022-03-25 18:03:00.000000000 +0100
+++ gegl-0.4.36/debian/patches/series 2022-06-23 19:06:20.000000000 +0200
@@ -0,0 +1,9 @@
+Add-missing-include-directives-to-ff-load.c-and-ff-save.c.patch
+Replace-deprecated-AVStream-codec-usages-with-a-separate-.patch
+Replace-avcodec_encode_-with-avcodec_send_frame-avcodec_r.patch
+Replace-avcodec_decode_-with-avcodec_send_packet-avcodec_.patch
+Call-avcodec_receive_-functions-in-a-loop-to-fetch-all-fr.patch
+Replace-deprecated-avpicture_get_size-avpicture_fill-and-.patch
+Replace-first-cur-_dts-Remove-no-op-functions-unused-vars.patch
+Do-not-override-const-AVOutputFormat-fields-fetched-by-av.patch
+Stop-stream-info-parsing-if-avformat_open_input-failed.patch
diff -Nru gegl-0.4.36/debian/patches/Stop-stream-info-parsing-if-avformat_open_input-failed.patch gegl-0.4.36/debian/patches/Stop-stream-info-parsing-if-avformat_open_input-failed.patch
--- gegl-0.4.36/debian/patches/Stop-stream-info-parsing-if-avformat_open_input-failed.patch 1970-01-01 01:00:00.000000000 +0100
+++ gegl-0.4.36/debian/patches/Stop-stream-info-parsing-if-avformat_open_input-failed.patch 2022-06-23 19:06:20.000000000 +0200
@@ -0,0 +1,28 @@
+From: Behnam Momeni <sbmom...@gmail.com>
+Date: Mon, 21 Mar 2022 12:49:00 +0330
+Subject: Stop stream info parsing if avformat_open_input failed
+
+---
+ operations/external/ff-load.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
+index 32d3fce..ec3b747 100644
+--- a/operations/external/ff-load.c
++++ b/operations/external/ff-load.c
+@@ -467,6 +467,7 @@ prepare (GeglOperation *operation)
+ if (err < 0)
+ {
+ print_error (o->path, err);
++ return;
+ }
+ err = avformat_find_stream_info (p->video_fcontext, NULL);
+ if (err < 0)
+@@ -478,6 +479,7 @@ prepare (GeglOperation *operation)
+ if (err < 0)
+ {
+ print_error (o->path, err);
++ return;
+ }
+ err = avformat_find_stream_info (p->audio_fcontext, NULL);
+ if (err < 0)
