[FFmpeg-cvslog] avcodec/options: Drop deprecation warning suppression macros

Diego Biurrun git at videolan.org
Tue Aug 6 16:52:46 CEST 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Aug  5 22:28:26 2013 +0200| [0ba4ea312b2a6bebbdd7ff228d46385159c63c9f] | committer: 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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ba4ea312b2a6bebbdd7ff228d46385159c63c9f
---

 libavcodec/options_table.h |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 8515603..5e9d484 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -23,7 +23,6 @@
 #include <float.h>
 #include <limits.h>
 
-#include "libavutil/internal.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "version.h"
@@ -40,7 +39,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 }, INT_MIN, INT_MAX, V|A|E},
 {"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[] = {
 {"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, A|V|D },
 {NULL},
 };
-FF_ENABLE_DEPRECATION_WARNINGS
 
 #undef A
 #undef V



More information about the ffmpeg-cvslog mailing list