Commit 0ba4ea31 authored by Diego Biurrun's avatar Diego Biurrun

avcodec/options: Drop deprecation warning suppression macros

The options table is used in tools built by the host compiler and the
deprecation macros pull in bits that are not safe to use if host and
target compiler differ.
parent 971cce7e
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <float.h> #include <float.h>
#include <limits.h> #include <limits.h>
#include "libavutil/internal.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
#include "version.h" #include "version.h"
...@@ -40,7 +39,6 @@ ...@@ -40,7 +39,6 @@
#define AV_CODEC_DEFAULT_BITRATE 200*1000 #define AV_CODEC_DEFAULT_BITRATE 200*1000
FF_DISABLE_DEPRECATION_WARNINGS
static const AVOption avcodec_options[] = { static const AVOption avcodec_options[] = {
{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, V|A|E}, {"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, V|A|E},
{"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far " {"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far "
...@@ -375,7 +373,6 @@ static const AVOption avcodec_options[] = { ...@@ -375,7 +373,6 @@ static const AVOption avcodec_options[] = {
{"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, A|V|D }, {"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, A|V|D },
{NULL}, {NULL},
}; };
FF_ENABLE_DEPRECATION_WARNINGS
#undef A #undef A
#undef V #undef V
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment