ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Wed Mar 29 15:20:10 2017 +0200| [a1b3ded902363a9790b9c2b1e18c2c02c035e9b7] | committer: Clément Bœsch
Merge commit '2025d3787158ba272a1b8fbc0493fa20dd7a8484' * commit '2025d3787158ba272a1b8fbc0493fa20dd7a8484': doc: Turn off noisy deprecation warnings in the option printer Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1b3ded902363a9790b9c2b1e18c2c02c035e9b7 --- doc/print_options.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/print_options.c b/doc/print_options.c index 9fd66ca..fd1cf10 100644 --- a/doc/print_options.c +++ b/doc/print_options.c @@ -23,6 +23,7 @@ */ #include <stddef.h> +#include <stdio.h> #include <string.h> #include <float.h> @@ -30,12 +31,17 @@ // for the target. without this build breaks on mingw #define AVFORMAT_OS_SUPPORT_H -#include "libavformat/avformat.h" -#include "libavformat/options_table.h" -#include "libavcodec/avcodec.h" -#include "libavcodec/options_table.h" +#include "libavutil/attributes.h" #include "libavutil/opt.h" +/* Forcibly turn off deprecation warnings, which just add noise here. */ +#undef attribute_deprecated +#define attribute_deprecated + +#include "libavcodec/options_table.h" + +#include "libavformat/options_table.h" + static void print_usage(void) { fprintf(stderr, "Usage: enum_options type\n" ====================================================================== diff --cc doc/print_options.c index 9fd66ca,eb54f07..fd1cf10 --- a/doc/print_options.c +++ b/doc/print_options.c @@@ -26,16 -27,17 +27,21 @@@ #include <string.h> #include <float.h> +// print_options is build for the host, os_support.h isn't needed and is setup +// for the target. without this build breaks on mingw +#define AVFORMAT_OS_SUPPORT_H + - #include "libavformat/avformat.h" - #include "libavformat/options_table.h" - #include "libavcodec/avcodec.h" - #include "libavcodec/options_table.h" + #include "libavutil/attributes.h" #include "libavutil/opt.h" + /* Forcibly turn off deprecation warnings, which just add noise here. */ + #undef attribute_deprecated + #define attribute_deprecated + + #include "libavcodec/options_table.h" + + #include "libavformat/options_table.h" + static void print_usage(void) { fprintf(stderr, "Usage: enum_options type\n" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
