Commit f046c3b5 authored by Vittorio Giovara's avatar Vittorio Giovara Committed by Luca Barbato

lavc: Move deprecation warning disabling to files including the table

Unbreak build from 7a5902c5.
Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent 7a5902c5
...@@ -33,7 +33,9 @@ ...@@ -33,7 +33,9 @@
#include <float.h> /* FLT_MIN, FLT_MAX */ #include <float.h> /* FLT_MIN, FLT_MAX */
#include <string.h> #include <string.h>
FF_DISABLE_DEPRECATION_WARNINGS
#include "options_table.h" #include "options_table.h"
FF_ENABLE_DEPRECATION_WARNINGS
static const char* context_to_name(void* ptr) { static const char* context_to_name(void* ptr) {
AVCodecContext *avc= ptr; AVCodecContext *avc= ptr;
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,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 "
...@@ -476,7 +475,6 @@ static const AVOption avcodec_options[] = { ...@@ -476,7 +475,6 @@ static const AVOption avcodec_options[] = {
{"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, A|V|E }, {"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, A|V|E },
{NULL}, {NULL},
}; };
FF_DISABLE_DEPRECATION_WARNINGS
#undef A #undef A
#undef V #undef V
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include "avformat.h" #include "avformat.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "internal.h" #include "internal.h"
#include "libavutil/internal.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
/** /**
...@@ -27,7 +29,9 @@ ...@@ -27,7 +29,9 @@
* Options definition for AVFormatContext. * Options definition for AVFormatContext.
*/ */
FF_DISABLE_DEPRECATION_WARNINGS
#include "options_table.h" #include "options_table.h"
FF_ENABLE_DEPRECATION_WARNINGS
static const char* format_to_name(void* ptr) static const char* format_to_name(void* ptr)
{ {
......
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