diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-31 13:19:50 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-31 13:19:50 +0000 |
| commit | 899e19f1776c607c126b291a7e0a614782f18f42 (patch) | |
| tree | 50792a530d56f35fff93eab04e03c2b8a6b8ad95 /libavcodec/options_table.h | |
| parent | 9938697c1c119a675759029ead74b91c529cdf2e (diff) | |
| parent | 936f0d98f864f9f6bb4f9e5458b78537e146bacd (diff) | |
Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'
* commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd':
lavc: Move rtp_payload_size to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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 ecf988cc73..a1ad72a291 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -127,8 +127,8 @@ static const AVOption avcodec_options[] = { #endif #if FF_API_PRIVATE_OPT {"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, V|E}, -#endif {"ps", "RTP payload size in bytes", OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif #if FF_API_STAT_BITS {"mv_bits", NULL, OFFSET(mv_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"header_bits", NULL, OFFSET(header_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, |