diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-12-15 23:25:16 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-12-15 23:25:16 +0000 |
| commit | 06a3c9c45a89bb599e433312bf6dc6678edbd3e0 (patch) | |
| tree | a47e1f6bd10c3930284018a2a73422866d2edfb2 | |
| parent | e6db28ceb246978243e9e5778a49f58bcf6abf80 (diff) | |
| download | ffmpeg-06a3c9c45a89bb599e433312bf6dc6678edbd3e0.tar.gz | |
Use positive logic in opt_target() for selecting the PAL/others
options, make its semantics mildly easier to compile by human minds.
Originally committed as revision 20877 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | ffmpeg.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -3641,7 +3641,7 @@ static void opt_target(const char *arg) } } if(verbose && norm != UNKNOWN) - fprintf(stderr, "Assuming %s for target.\n", norm != PAL ? "NTSC" : "PAL"); + fprintf(stderr, "Assuming %s for target.\n", norm == PAL ? "PAL" : "NTSC"); } if(norm == UNKNOWN) { @@ -3657,9 +3657,9 @@ static void opt_target(const char *arg) opt_audio_codec("mp2"); opt_format("vcd"); - opt_frame_size(norm != PAL ? "352x240" : "352x288"); + opt_frame_size(norm == PAL ? "352x288" : "352x240"); opt_frame_rate(NULL, frame_rates[norm]); - opt_default("g", norm != PAL ? "18" : "15"); + opt_default("g", norm == PAL ? "15" : "18"); opt_default("b", "1150000"); opt_default("maxrate", "1150000"); @@ -3685,9 +3685,9 @@ static void opt_target(const char *arg) opt_audio_codec("mp2"); opt_format("svcd"); - opt_frame_size(norm != PAL ? "480x480" : "480x576"); + opt_frame_size(norm == PAL ? "480x576" : "480x480"); opt_frame_rate(NULL, frame_rates[norm]); - opt_default("g", norm != PAL ? "18" : "15"); + opt_default("g", norm == PAL ? "15" : "18"); opt_default("b", "2040000"); opt_default("maxrate", "2516000"); @@ -3707,9 +3707,9 @@ static void opt_target(const char *arg) opt_audio_codec("ac3"); opt_format("dvd"); - opt_frame_size(norm != PAL ? "720x480" : "720x576"); + opt_frame_size(norm == PAL ? "720x576" : "720x480"); opt_frame_rate(NULL, frame_rates[norm]); - opt_default("g", norm != PAL ? "18" : "15"); + opt_default("g", norm == PAL ? "15" : "18"); opt_default("b", "6000000"); opt_default("maxrate", "9000000"); @@ -3728,7 +3728,7 @@ static void opt_target(const char *arg) opt_frame_size(norm != PAL ? "720x480" : "720x576"); opt_frame_pix_fmt(!strncmp(arg, "dv50", 4) ? "yuv422p" : - (norm != PAL ? "yuv411p" : "yuv420p")); + (norm == PAL ? "yuv420p" : "yuv411p")); opt_frame_rate(NULL, frame_rates[norm]); audio_sample_rate = 48000; |