diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2025-11-30 14:32:51 -0500 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2025-11-30 14:32:51 -0500 |
| commit | c8412bbedae0fce38db96833732e8ce904721e4c (patch) | |
| tree | 4611046186c714513d042966ce97825df0fecf9e /src/codec/ffmpeg | |
| parent | 0d6d13425015d78606232874498327cabcb0e4e2 (diff) | |
| download | camu-c8412bbedae0fce38db96833732e8ce904721e4c.tar.gz camu-c8412bbedae0fce38db96833732e8ce904721e4c.tar.bz2 camu-c8412bbedae0fce38db96833732e8ce904721e4c.zip | |
Build cleanup and fixes from sink testing
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/codec/ffmpeg')
| -rw-r--r-- | src/codec/ffmpeg/decoder.c | 3 | ||||
| -rw-r--r-- | src/codec/ffmpeg/meson.build | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/codec/ffmpeg/decoder.c b/src/codec/ffmpeg/decoder.c index 645a88a..7d50bca 100644 --- a/src/codec/ffmpeg/decoder.c +++ b/src/codec/ffmpeg/decoder.c @@ -114,9 +114,6 @@ static enum AVPixelFormat get_hw_format(AVCodecContext *context, const enum AVPi log_error("Failed to get %s HW surface format.", hwdevice_name); // Remake AVCodecContext as a software decoder. - // This might log an error like "Your platform doesn't support hardware accelerated AV1 decoding.". - // Even though the problem is really a lack of any decoder hardware OR software. - // This happens with wine + d3d11va. Maybe a build configuration issue or FFmpeg bug? AVCodecParameters *codecpar = av->codecpar; av->errored_hw_context = av->codec_context; alloc_codec_context_internal(av, codec, codecpar); diff --git a/src/codec/ffmpeg/meson.build b/src/codec/ffmpeg/meson.build index 6482426..e34cc92 100644 --- a/src/codec/ffmpeg/meson.build +++ b/src/codec/ffmpeg/meson.build @@ -11,7 +11,7 @@ ffmpeg_server_deps = [] ffmpeg_client_src = [ffmpeg_src, 'decoder.c', 'resampler.c', 'scaler.c'] ffmpeg_client_deps = [] -ffmpeg_force_fallback = false +ffmpeg_force_fallback = get_option('wrap_mode') == 'forcefallback' foreach dep: ['ffmpeg', 'libavutil', 'libavformat', 'libavcodec', 'libavdevice', 'libswresample', 'libswscale'] if dep in get_option('force_fallback_for') ffmpeg_force_fallback = true |