diff options
author | James Almer <jamrial@gmail.com> | 2017-10-23 15:11:42 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-23 15:20:49 -0300 |
commit | b46613dd9b8b4adc68312a283486c33c109aab19 (patch) | |
tree | 8fd31b65306b5781bc8a2a4ae3fafff9e109839e /libavcodec/options_table.h | |
parent | c381f6a483e00ab8bfa4f777284b89acdad6dd94 (diff) | |
parent | dcc39ee10e82833ce24aa57926c00ffeb1948198 (diff) | |
download | ffmpeg-b46613dd9b8b4adc68312a283486c33c109aab19.tar.gz |
Merge commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198'
* commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198':
lavc: Remove deprecated XvMC support hacks
Merged-by: James Almer <jamrial@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 c40b3e61b4..6e90c0d77c 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -329,9 +329,6 @@ static const AVOption avcodec_options[] = { {"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, #endif {"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#if FF_API_XVMC -{"xvmc_acceleration", NULL, OFFSET(xvmc_acceleration), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif /* FF_API_XVMC */ {"mbd", "macroblock decision algorithm (high quality mode)", OFFSET(mb_decision), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, 2, V|E, "mbd"}, {"simple", "use mbcmp", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_SIMPLE }, INT_MIN, INT_MAX, V|E, "mbd"}, {"bits", "use fewest bits", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_BITS }, INT_MIN, INT_MAX, V|E, "mbd"}, |