diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2014-07-13 20:53:15 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2014-07-13 20:53:19 +1000 |
| commit | 7251201819c0b4784b8a5cdd59ecde102cae2c07 (patch) | |
| tree | 68c39ef652bdcbfb891ddc9c73f0147c2639eb9b /src/flac/main.c | |
| parent | 879a0ce2a5b4da7444732b3fe80767d4b2b003a0 (diff) | |
| download | flac-7251201819c0b4784b8a5cdd59ecde102cae2c07.tar.gz | |
flac/main.c : Improved option validation with --force-raw-format.
Patch-from: lvqcl <lvqcl.mail@gmail.com>
Diffstat (limited to 'src/flac/main.c')
| -rw-r--r-- | src/flac/main.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/flac/main.c b/src/flac/main.c index e70f81fe..4abc1922 100644 --- a/src/flac/main.c +++ b/src/flac/main.c @@ -399,20 +399,6 @@ int do_it(void) if(option_values.format_sample_rate >= 0) return usage_error("ERROR: --sample-rate not allowed with --decode\n"); } - else { - if(!option_values.force_raw_format) { - if(option_values.format_is_big_endian >= 0) - return usage_error("ERROR: --endian only allowed with --force-raw-format\n"); - if(option_values.format_is_unsigned_samples >= 0) - return usage_error("ERROR: --sign only allowed with --force-raw-format\n"); - if(option_values.format_channels >= 0) - return usage_error("ERROR: --channels only allowed with --force-raw-format\n"); - if(option_values.format_bps >= 0) - return usage_error("ERROR: --bps only allowed with --force-raw-format\n"); - if(option_values.format_sample_rate >= 0) - return usage_error("ERROR: --sample-rate only allowed with --force-raw-format\n"); - } - } if(option_values.ignore_chunk_sizes) { if(option_values.mode_decode) @@ -1850,6 +1836,12 @@ int encode_file(const char *infilename, FLAC__bool is_first_file, FLAC__bool is_ return usage_error("ERROR: for encoding a raw file you must specify a value for --endian, --sign, --channels, --bps, and --sample-rate\n"); } } + else { + if(option_values.format_is_big_endian >= 0 || option_values.format_is_unsigned_samples >= 0 || option_values.format_channels >= 0 || option_values.format_bps >= 0 || option_values.format_sample_rate >= 0) { + conditional_fclose(encode_infile); + return usage_error("ERROR: raw format options (--endian, --sign, --channels, --bps, and --sample-rate) are not allowed for non-raw input\n"); + } + } if(option_values.force_to_stdout) { if(option_values.replay_gain) { |