On 23.08.2015 11:05, Hendrik Leppkes wrote:
> On Sun, Aug 23, 2015 at 10:51 AM, Andreas Cadhalpun
>> So instead of including that, one can copy the definition of the
>> FF_{DIS,EN}ABLE_DEPRECATION_WARNINGS macros, see attached patch.
>>
>> Alternatively one could just revert the changes to libavcodec/options_table.h
>> and ignore the warnings in that file.
>
> Copying the macros is unnecessary bloat. Either just enable the
> warnings there again,
OK, patch for that attached.
> or hack around in print_options.c to make it
> avoid the error in other ways.
I don't think that's worth the trouble.
Best regards,
Andreas
>From 96592b50ea0b1d050a7f95166653e742306897d3 Mon Sep 17 00:00:00 2001
From: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
Date: Sun, 23 Aug 2015 11:16:10 +0200
Subject: [PATCH] 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.
Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
---
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
--
2.5.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
