Remove the x264 VBV settings.

[nageru] / nageru / flags.cpp

diff --git a/nageru/flags.cpp b/nageru/flags.cpp
index 2a31422f854b723502a3680c536525a63da4dde8..3066d3afc01b5cc4db0cf96adb9c6fc0892ccca6 100644 (file)
--- a/nageru/flags.cpp
+++ b/nageru/flags.cpp
@@ -176,10 +176,6 @@ void usage(Program program)
        fprintf(stderr, "      --x264-bitrate              x264 bitrate (in kilobit/sec, default %d)\n",
                DEFAULT_X264_OUTPUT_BIT_RATE);
        fprintf(stderr, "      --x264-crf=VALUE            quality-based VBR (-12 to 51), incompatible with --x264-bitrate and VBV\n");
-       fprintf(stderr, "      --x264-vbv-bufsize          x264 VBV size (in kilobits, 0 = one-frame VBV,\n");
-       fprintf(stderr, "                                  default: same as --x264-bitrate, that is, one-second VBV)\n");
-       fprintf(stderr, "      --x264-vbv-max-bitrate      x264 local max bitrate (in kilobit/sec per --vbv-bufsize,\n");
-       fprintf(stderr, "                                  0 = no limit, default: same as --x264-bitrate, i.e., CBR)\n");
        fprintf(stderr, "      --x264-param=NAME[,VALUE]   set any x264 parameter, for fine tuning\n");
        if (program == PROGRAM_NAGERU) {
                fprintf(stderr, "      --x264-separate-disk-preset x264 quality preset (default " X264_DEFAULT_PRESET ")\n");
@@ -293,8 +289,6 @@ void parse_flags(Program program, int argc, char * const argv[])
                { "x264-speedcontrol-verbose", no_argument, 0, OPTION_X264_SPEEDCONTROL_VERBOSE },
                { "x264-bitrate", required_argument, 0, OPTION_X264_BITRATE },
                { "x264-crf", required_argument, 0, OPTION_X264_CRF },
-               { "x264-vbv-bufsize", required_argument, 0, OPTION_X264_VBV_BUFSIZE },
-               { "x264-vbv-max-bitrate", required_argument, 0, OPTION_X264_VBV_MAX_BITRATE },
                { "x264-param", required_argument, 0, OPTION_X264_PARAM },
                { "x264-separate-disk-preset", required_argument, 0, OPTION_X264_SEPARATE_DISK_PRESET },
                { "x264-separate-disk-tune", required_argument, 0, OPTION_X264_SEPARATE_DISK_TUNE },
@@ -485,12 +479,6 @@ void parse_flags(Program program, int argc, char * const argv[])
                case OPTION_X264_CRF:
                        global_flags.x264_crf = atof(optarg);
                        break;
-               case OPTION_X264_VBV_BUFSIZE:
-                       global_flags.x264_vbv_buffer_size = atoi(optarg);
-                       break;
-               case OPTION_X264_VBV_MAX_BITRATE:
-                       global_flags.x264_vbv_max_bitrate = atoi(optarg);
-                       break;
                case OPTION_X264_PARAM:
                        global_flags.x264_extra_param.push_back(optarg);
                        break;
@@ -815,9 +803,6 @@ void parse_flags(Program program, int argc, char * const argv[])
                        fprintf(stderr, "ERROR: --x264-bitrate and --x264-crf are mutually incompatible.\n");
                        exit(1);
                }
-               if (global_flags.x264_vbv_max_bitrate != -1 && global_flags.x264_vbv_buffer_size != -1) {
-                       fprintf(stderr, "WARNING: VBV settings are ignored with --x264-crf.\n");
-               }
        } else if (global_flags.x264_bitrate == -1) {
                global_flags.x264_bitrate = DEFAULT_X264_OUTPUT_BIT_RATE;
        }