[FFmpeg-cvslog] lavf/avio: do not include bprint.h.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <george at nsup.org> | Thu Jul 24 09:34:10 2014 +0200| [04bc37007224cfab68bc557507c449fb661218e5] | committer: Michael Niedermayer

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 at nsup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04bc37007224cfab68bc557507c449fb661218e5
---

 libavformat/avio.h    |    3 +--
 libavformat/aviobuf.c |    1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 9b16843..e607df5 100644
--- 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 463d90a..24c6b79 100644
--- 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"