diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:42:44 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:42:44 +0300 |
commit | b27ddffbfb29f456d43c2f155eef5230b940a48b (patch) | |
tree | 85b29b1913c026ca408711e253f42a8e34a0d320 /libavcodec/options_table.h | |
parent | 144fb06806664d4f3bc681ed1408383baeb515f4 (diff) | |
parent | dc70c19476e76f1118df73b5d97cc76f0e5f6f6c (diff) |
Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c'
* commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c':
lavc: Drop deprecated request_channels related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/options_table.h')
-rw-r--r-- | libavcodec/options_table.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 93d4f779a4..c18bd85b94 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -411,9 +411,6 @@ static const AVOption avcodec_options[] = { {"min_prediction_order", NULL, OFFSET(min_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, {"max_prediction_order", NULL, OFFSET(max_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, {"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, INT64_MAX, V|E}, -#if FF_API_REQUEST_CHANNELS -{"request_channels", "set desired number of audio channels", OFFSET(request_channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D}, -#endif {"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|E|D, "channel_layout"}, {"request_channel_layout", NULL, OFFSET(request_channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|D, "request_channel_layout"}, |