X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fflags.cpp;h=1878038a46fb58ed2bc39b9e2a0994169c0bd2c0;hb=23a236b4b2c551376b90c31d9a6cf72025da368c;hp=2bd0eeca0aa183b01f13c4ba03dfbb1ecf831d17;hpb=8bb8bb7cc9700befab35a8cc2c4b7a88f0638af9;p=nageru diff --git a/nageru/flags.cpp b/nageru/flags.cpp index 2bd0eec..1878038 100644 --- a/nageru/flags.cpp +++ b/nageru/flags.cpp @@ -460,7 +460,6 @@ void parse_flags(Program program, int argc, char * const argv[]) break; case OPTION_RECORD_X264_VIDEO: global_flags.x264_video_to_disk = true; - global_flags.x264_video_to_http = true; break; case OPTION_SEPARATE_X264_DISK_ENCODE: global_flags.x264_video_to_disk = true; @@ -706,6 +705,9 @@ void parse_flags(Program program, int argc, char * const argv[]) global_flags.x264_video_to_http = true; } } + if (global_flags.x264_video_to_disk && !global_flags.uncompressed_video_to_http && !global_flags.av1_video_to_http) { + global_flags.x264_video_to_http = true; // Quick Sync to HTTP but x264 to disk doesn't make sense. + } if (global_flags.min_num_cards <= 0) { fprintf(stderr, "ERROR: --num-cards must be at least 1\n"); exit(1);