lavf/avio: do not include bprint.h.

C++ chokes on the definition of AVBPrint.
Including avio.h from c++ code used to work.
Fix trac ticket #3800.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 9b168433aa2735dbbc5fbe36053af08971daae24..e607df5fb476f20a9fa482752eefd6d2dc2c239e 100644 (file)
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -31,7 +31,6 @@
 #include "libavutil/common.h"
 #include "libavutil/dict.h"
 #include "libavutil/log.h"
-#include "libavutil/bprint.h"
 
 #include "libavformat/version.h"
 
@@ -507,6 +506,6 @@ int64_t avio_seek_time(AVIOContext *h, int stream_index,
  * @return 0 for success (max_size bytes read or EOF reached), negative error
  * code otherwise
  */
-int avio_read_to_bprint(AVIOContext *h, AVBPrint *pb, size_t max_size);
+int avio_read_to_bprint(AVIOContext *h, struct AVBPrint *pb, size_t max_size);
 
 #endif /* AVFORMAT_AVIO_H */

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 463d90a0d3c9fc5c8d2a35aa95a299f29d8cab37..24c6b79097a7300e63a828bc583e0c37cfb59ccb 100644 (file)
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/bprint.h"
 #include "libavutil/crc.h"
 #include "libavutil/dict.h"
 #include "libavutil/intreadwrite.h"