diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-18 14:39:15 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-18 14:39:15 +0100 |
commit | 362028cac913e232ce8c3702fa4c96b33fc5e0de (patch) | |
tree | 9ddb25aabdab4278d23fb61c72735f4250ea588f /libavcodec/options_table.h | |
parent | 2630f7f709049113dc03d6b999efad6acc423d67 (diff) | |
parent | 16216b713f9a21865cc07993961cf5d0ece24916 (diff) | |
download | ffmpeg-streaming-362028cac913e232ce8c3702fa4c96b33fc5e0de.zip ffmpeg-streaming-362028cac913e232ce8c3702fa4c96b33fc5e0de.tar.gz |
Merge commit '16216b713f9a21865cc07993961cf5d0ece24916'
* commit '16216b713f9a21865cc07993961cf5d0ece24916':
lavc: Drop exporting 2-pass encoding stats
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/options_table.h')
-rw-r--r-- | libavcodec/options_table.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 878cf0c..cc11900 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -127,6 +127,7 @@ static const AVOption avcodec_options[] = { #endif {"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}, {"ps", "RTP payload size in bytes", OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#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}, {"i_tex_bits", NULL, OFFSET(i_tex_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, @@ -136,6 +137,7 @@ static const AVOption avcodec_options[] = { {"skip_count", NULL, OFFSET(skip_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"misc_bits", NULL, OFFSET(misc_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"frame_bits", NULL, OFFSET(frame_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +#endif {"codec_tag", NULL, OFFSET(codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"bug", "work around not autodetected encoder bugs", OFFSET(workaround_bugs), AV_OPT_TYPE_FLAGS, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, {"autodetect", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, |