diff options
| author | Michael Niedermayer <[email protected]> | 2013-08-03 09:16:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-08-03 09:16:36 +0200 |
| commit | a8e963835a43e64311751b01f44707bd0e360d46 (patch) | |
| tree | 3b21d37293b3765a70ae195dc61fd6984e3b69d9 /libavcodec/options_table.h | |
| parent | 8e970a58614fe15565d5849c933f17b9ec138647 (diff) | |
| parent | b5a138652ff8a5b987d3e1191e67fd9f6575527e (diff) | |
Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
Give less generic names to global library option arrays
Conflicts:
libavcodec/options_table.h
libavfilter/avfilter.c
libavformat/options_table.h
libswscale/options.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 3461a6f4f5..e9cdfc4ac4 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -40,7 +40,7 @@ #define AV_CODEC_DEFAULT_BITRATE 200*1000 -static const AVOption options[]={ +static const AVOption avcodec_options[] = { {"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, INT_MAX, A|V|E}, {"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = 128*1000 }, 0, INT_MAX, A|E}, {"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far " |