diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 19:45:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 19:45:38 +0200 |
| commit | 76aec9e6b4a2aabe659013198620276822420ad9 (patch) | |
| tree | 5060d557498c86fe53bed5e6a8c5e9189a6ee0c8 /libavcodec/options_table.h | |
| parent | 85aaa4e6d571e44749f80b8223c07d656bf8e035 (diff) | |
| parent | bad81800bb51f43d28d656abf5d45b477e3b3198 (diff) | |
| download | ffmpeg-76aec9e6b4a2aabe659013198620276822420ad9.tar.gz | |
Merge commit 'bad81800bb51f43d28d656abf5d45b477e3b3198'
* commit 'bad81800bb51f43d28d656abf5d45b477e3b3198':
avcodec: options: Add missing deprecation ifdefs around emu_edge
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 cbefa52275..7d4984dd4d 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -66,7 +66,9 @@ static const AVOption avcodec_options[] = { {"pass1", "use internal 2-pass ratecontrol in first pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_PASS1 }, INT_MIN, INT_MAX, 0, "flags"}, {"pass2", "use internal 2-pass ratecontrol in second pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_PASS2 }, INT_MIN, INT_MAX, 0, "flags"}, {"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V|E|D, "flags"}, +#if FF_API_EMU_EDGE {"emu_edge", "do not draw edges", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_EMU_EDGE }, INT_MIN, INT_MAX, 0, "flags"}, +#endif {"psnr", "error[?] variables will be set during encoding", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_PSNR }, INT_MIN, INT_MAX, V|E, "flags"}, {"truncated", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_TRUNCATED }, INT_MIN, INT_MAX, 0, "flags"}, #if FF_API_NORMALIZE_AQP |