ffmpeg | branch: master | Andreas Cadhalpun <[email protected]> | Sun Aug 23 11:16:10 2015 +0200| [01594ebb077c54961334b7ca82676b453f1eefd9] | committer: Andreas Cadhalpun
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 <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01594ebb077c54961334b7ca82676b453f1eefd9 --- libavcodec/options_table.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index d4711ed..93d4f77 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 _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
