diff options
| author | James Zern <jzern@google.com> | 2014-01-14 17:56:45 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2014-01-14 18:22:01 -0800 |
| commit | 5248d7111e8b375cfc9891219125d3e32fa05dcd (patch) | |
| tree | 79cd74d9630e0e73aa5fbd8817b404b966a5d6c2 | |
| parent | f13b3d1e08ef4d5842e283c1113f8d67f3960b37 (diff) | |
| download | libvpx-5248d7111e8b375cfc9891219125d3e32fa05dcd.tar libvpx-5248d7111e8b375cfc9891219125d3e32fa05dcd.tar.gz libvpx-5248d7111e8b375cfc9891219125d3e32fa05dcd.tar.bz2 libvpx-5248d7111e8b375cfc9891219125d3e32fa05dcd.zip | |
vpxenc: remove some warnings w/--disable-(vp8|vp9)
group vp8/vp9 only options under CONFIG_*_ENCODER
Change-Id: I331bb154df019b398780be6451355de50657a33e
| -rw-r--r-- | vpxenc.c | 27 |
1 files changed, 13 insertions, 14 deletions
@@ -362,12 +362,6 @@ static const arg_def_t static_thresh = ARG_DEF(NULL, "static-thresh", 1, "Motion detection threshold"); static const arg_def_t cpu_used = ARG_DEF(NULL, "cpu-used", 1, "CPU Used (-16..16)"); -static const arg_def_t token_parts = ARG_DEF(NULL, "token-parts", 1, - "Number of token partitions to use, log2"); -static const arg_def_t tile_cols = ARG_DEF(NULL, "tile-columns", 1, - "Number of tile columns to use, log2"); -static const arg_def_t tile_rows = ARG_DEF(NULL, "tile-rows", 1, - "Number of tile rows to use, log2"); static const arg_def_t auto_altref = ARG_DEF(NULL, "auto-alt-ref", 1, "Enable automatic alt reference frames"); static const arg_def_t arnr_maxframes = ARG_DEF(NULL, "arnr-maxframes", 1, @@ -387,16 +381,10 @@ static const arg_def_t cq_level = ARG_DEF(NULL, "cq-level", 1, "Constant/Constrained Quality level"); static const arg_def_t max_intra_rate_pct = ARG_DEF(NULL, "max-intra-rate", 1, "Max I-frame bitrate (pct)"); -static const arg_def_t lossless = ARG_DEF(NULL, "lossless", 1, "Lossless mode"); -#if CONFIG_VP9_ENCODER -static const arg_def_t frame_parallel_decoding = ARG_DEF( - NULL, "frame-parallel", 1, "Enable frame parallel decodability features"); -static const arg_def_t aq_mode = ARG_DEF( - NULL, "aq-mode", 1, - "Adaptive q mode (0: off (by default), 1: variance 2: complexity)"); -#endif #if CONFIG_VP8_ENCODER +static const arg_def_t token_parts = + ARG_DEF(NULL, "token-parts", 1, "Number of token partitions to use, log2"); static const arg_def_t *vp8_args[] = { &cpu_used, &auto_altref, &noise_sens, &sharpness, &static_thresh, &token_parts, &arnr_maxframes, &arnr_strength, &arnr_type, @@ -414,6 +402,17 @@ static const int vp8_arg_ctrl_map[] = { #endif #if CONFIG_VP9_ENCODER +static const arg_def_t tile_cols = + ARG_DEF(NULL, "tile-columns", 1, "Number of tile columns to use, log2"); +static const arg_def_t tile_rows = + ARG_DEF(NULL, "tile-rows", 1, "Number of tile rows to use, log2"); +static const arg_def_t lossless = ARG_DEF(NULL, "lossless", 1, "Lossless mode"); +static const arg_def_t frame_parallel_decoding = ARG_DEF( + NULL, "frame-parallel", 1, "Enable frame parallel decodability features"); +static const arg_def_t aq_mode = ARG_DEF( + NULL, "aq-mode", 1, + "Adaptive q mode (0: off (by default), 1: variance 2: complexity)"); + static const arg_def_t *vp9_args[] = { &cpu_used, &auto_altref, &noise_sens, &sharpness, &static_thresh, &tile_cols, &tile_rows, &arnr_maxframes, &arnr_strength, &arnr_type, |