Le duodi 22 thermidor, an CCXXII, Michael Niedermayer a écrit : > ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Aug 9 > 15:30:03 2014 +0200| [f75786f3bc8819545aa070f62d2ab3b579a8c781] | committer: > Michael Niedermayer > > avformat/avio: Fix "warning: struct AVBPrint declared inside parameter list" > > Signed-off-by: Michael Niedermayer <michae...@gmx.at> > > > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f75786f3bc8819545aa070f62d2ab3b579a8c781 > --- > > libavformat/avio.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/libavformat/avio.h b/libavformat/avio.h > index 1aa3602..89e0804 100644 > --- a/libavformat/avio.h > +++ b/libavformat/avio.h > @@ -28,6 +28,7 @@ > > #include <stdint.h> > > +#include "libavutil/bprint.h" > #include "libavutil/common.h" > #include "libavutil/dict.h" > #include "libavutil/log.h"
It was removed on purpose: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04bc37007224cfab68bc557507c449fb661218e5 I had not noticed the warning before submitting the fix. Here is an updated version. I have pushed it to my tree too, feel free to merge it if it is satisfactory. Regards, -- Nicolas George
From f87db44685393f85c89cb338c8617e2ee6bd51f8 Mon Sep 17 00:00:00 2001
From: Nicolas George <geo...@nsup.org>
Date: Sat, 9 Aug 2014 15:51:04 +0200
Subject: [PATCH] lavf/avio: do not include bprint.h.
See f75786f and 04bc370.
Signed-off-by: Nicolas George <geo...@nsup.org>
---
libavformat/avio.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 89e0804..2210c01 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -28,7 +28,6 @@
#include <stdint.h>
-#include "libavutil/bprint.h"
#include "libavutil/common.h"
#include "libavutil/dict.h"
#include "libavutil/log.h"
@@ -508,6 +507,9 @@ int avio_pause(AVIOContext *h, int pause);
int64_t avio_seek_time(AVIOContext *h, int stream_index,
int64_t timestamp, int flags);
+/* Avoid a warning. The header can not be included because it breaks c++. */
+struct AVBPrint;
+
/**
* Read contents of h into print buffer, up to max_size bytes, or up to EOF.
*
--
2.0.1
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
