e919f66b39
* test: update format refs to ffmpeg 6 * github/workflows: fix failure conditions * common/av_common: clean up mp_lavc_set_extradata * sub/sd_lavc: properly fill avctx with codecpar values at init * sub/lavc_conv: properly fill avctx with codecpar values at init * common/av_common: constify mp_codec_params related getters * demux_mkv: support ARIB captions * player/command: fix mem leak in user-data property; closes #11436 * vo_gpu_next: compatibility with libplacebo v6.265 * wayland: make wayland-edge-pixels-pointer default to 16 * wayland: use correct x/y coordinates for the cursor * screenshot: fix segfault when taking a screenshot without video * wayland: fix client side resize * vo_gpu_next: compatibility with PL_API_VER >= 254 * vo_gpu_next: use inverse mapping functions to tag screenshots * video/out/placebo/utils: add mappings from pl enums to mpv enums * video: add missing libplacebo colorspace enums * mp_image: assert if src and dst are different in copy_attributes * mp_image: copy side data in mp_image_copy_attributes * ao_pipewire: use realtime scheduling for data thread * loadfile: strongly prefer that all streams are from the same program * command: expose hls-bitrate and program-id as track-list subproperties * loadfile: report hls_bitrate and program_id in struct track * demux: propagate hls_bitrate and program_id in generated caption tracks * demux_lavf: report program_id * ytdl_hook: only log error when no fallback url available * ytdl_hook: init fragment requires other fragments * vo: fix race condition with redraw requests * ci: separate meson tests and reorganize build steps OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=292
25 lines
639 B
Diff
25 lines
639 B
Diff
From 7feac1e3ab52002314a0a939313cdea93f5a0b3a Mon Sep 17 00:00:00 2001
|
|
From: Mia Herkt <mia@0x0.st>
|
|
Date: Sat, 18 Mar 2023 01:10:57 +0100
|
|
Subject: [PATCH] av_log: make FFmpeg version check non-fatal
|
|
|
|
---
|
|
common/av_log.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/common/av_log.c b/common/av_log.c
|
|
index 15d17aff..ae173592 100644
|
|
--- a/common/av_log.c
|
|
+++ b/common/av_log.c
|
|
@@ -207,7 +207,6 @@ void check_library_versions(struct mp_log *log, int v)
|
|
{
|
|
fprintf(stderr, "%s: %d.%d.%d -> %d.%d.%d\n",
|
|
l->name, V(l->buildv), V(l->runv));
|
|
- abort();
|
|
}
|
|
}
|
|
}
|
|
--
|
|
2.40.0
|
|
|