Jan Engelhardt
9216b3cfa9
Fix name in spec file from previous request >Submit wlroots10 to satisfy packages that require wlroots >=0.15.0 and wlroots < 0.16.0, such as sway and wayfire as of right now. Fixes boo#1205766 >This package might not be needed anymore once sway and wayfire have a new release. For sway it should be very soon since sway and wlroots are very tied together. wayfire doesn't have new releases often, but the build is fixed on the master branch on git at the very least. OBS-URL: https://build.opensuse.org/request/show/1038318 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wlroots10?expand=0&rev=1
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 35b3d67e5f0c12ae8d3174a268b0af73724ecc3e Mon Sep 17 00:00:00 2001
|
|
From: Keith Bowes <keithbowes@users.noreply.github.com>
|
|
Date: Thu, 17 Feb 2022 16:46:17 -0500
|
|
Subject: [PATCH] Fixed compiling with FFmpeg 5.0
|
|
|
|
---
|
|
examples/dmabuf-capture.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/examples/dmabuf-capture.c b/examples/dmabuf-capture.c
|
|
index 4d05b78ba..58bf64195 100644
|
|
--- a/examples/dmabuf-capture.c
|
|
+++ b/examples/dmabuf-capture.c
|
|
@@ -1,4 +1,5 @@
|
|
#define _POSIX_C_SOURCE 199309L
|
|
+#include <libavcodec/avcodec.h>
|
|
#include <libavformat/avformat.h>
|
|
#include <libavutil/display.h>
|
|
#include <libavutil/hwcontext_drm.h>
|
|
@@ -619,12 +620,12 @@ static int init_encoding(struct capture_context *ctx) {
|
|
}
|
|
|
|
/* Find encoder */
|
|
- AVCodec *out_codec = avcodec_find_encoder_by_name(ctx->encoder_name);
|
|
+ const AVCodec *out_codec = avcodec_find_encoder_by_name(ctx->encoder_name);
|
|
if (!out_codec) {
|
|
av_log(ctx, AV_LOG_ERROR, "Codec not found (not compiled in lavc?)!\n");
|
|
return AVERROR(EINVAL);
|
|
}
|
|
- ctx->avf->oformat->video_codec = out_codec->id;
|
|
+ ctx->avf->oformat = av_guess_format(ctx->encoder_name, NULL, NULL);
|
|
ctx->is_software_encoder = !(out_codec->capabilities & AV_CODEC_CAP_HARDWARE);
|
|
|
|
ctx->avctx = avcodec_alloc_context3(out_codec);
|
|
--
|
|
GitLab
|
|
|