diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-08-23 11:16:10 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-08-23 23:35:14 +0200 |
| commit | 01594ebb077c54961334b7ca82676b453f1eefd9 (patch) | |
| tree | 456b8ef70e19337e42f0d2a7e4049c233936b266 | |
| parent | 03e71cccba288e8f3c8ad57ed77b0b267caf8dd1 (diff) | |
| download | ffmpeg-01594ebb077c54961334b7ca82676b453f1eefd9.tar.gz | |
options_table: fix compatibility with MSVC
Including libavutil/internal.h breaks compilation of doc/print_options.c
with MSVC due to linking avpriv_strtod/avpriv_snprintf.
This reverts part of commit 095347f.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -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 d4711edd37..93d4f779a4 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -26,7 +26,6 @@ #include <limits.h> #include <stdint.h> -#include "libavutil/internal.h" #include "libavutil/opt.h" #include "avcodec.h" #include "version.h" @@ -42,7 +41,6 @@ #define AV_CODEC_DEFAULT_BITRATE 200*1000 -FF_DISABLE_DEPRECATION_WARNINGS static const AVOption avcodec_options[] = { {"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, INT_MAX, A|V|E}, {"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = 128*1000 }, 0, INT_MAX, A|E}, @@ -506,7 +504,6 @@ static const AVOption avcodec_options[] = { {"video_size", "set video size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str=NULL}, 0, INT_MAX, 0 }, {NULL}, }; -FF_ENABLE_DEPRECATION_WARNINGS #undef A #undef V |