From 31e54bdc8551fa5c9984311341fcbd05938eca9d Mon Sep 17 00:00:00 2001 From: dec05eba Date: Thu, 30 Nov 2023 17:47:04 +0100 Subject: Allow both hevc and h265 (as alias) --- kms/client/kms_client.c | 2 +- src/main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kms/client/kms_client.c b/kms/client/kms_client.c index 75b1e8a..0ea7cab 100644 --- a/kms/client/kms_client.c +++ b/kms/client/kms_client.c @@ -199,7 +199,7 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) { } else { cap_t kms_server_cap = cap_get_file(server_filepath); if(kms_server_cap) { - cap_flag_value_t res = 0; + cap_flag_value_t res = CAP_CLEAR; cap_get_flag(kms_server_cap, CAP_SYS_ADMIN, CAP_PERMITTED, &res); if(res == CAP_SET) { //fprintf(stderr, "has permission!\n"); diff --git a/src/main.cpp b/src/main.cpp index aafd9da..32da56d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1436,12 +1436,12 @@ int main(int argc, char **argv) { if(strcmp(video_codec_to_use, "h264") == 0) { video_codec = VideoCodec::H264; - } else if(strcmp(video_codec_to_use, "h265") == 0) { + } else if(strcmp(video_codec_to_use, "h265") == 0 || strcmp(video_codec_to_use, "hevc") == 0) { video_codec = VideoCodec::HEVC; } else if(strcmp(video_codec_to_use, "av1") == 0) { video_codec = VideoCodec::AV1; } else if(strcmp(video_codec_to_use, "auto") != 0) { - fprintf(stderr, "Error: -k should either be either 'auto', 'h264', 'h265' or 'av1', got: '%s'\n", video_codec_to_use); + fprintf(stderr, "Error: -k should either be either 'auto', 'h264', 'h265', 'hevc' or 'av1', got: '%s'\n", video_codec_to_use); usage(); } -- cgit v1.2.3