summaryrefslogtreecommitdiffstats
path: root/libavformat/avio.h
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2014-07-24 09:34:10 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-25 05:37:45 +0200
commit04bc37007224cfab68bc557507c449fb661218e5 (patch)
tree31c64a55ec4c6da11f34283264357409ca2056b4 /libavformat/avio.h
parent66ae994c544a46e4f6915222d8608b3d87b39b07 (diff)
downloadffmpeg-streaming-04bc37007224cfab68bc557507c449fb661218e5.zip
ffmpeg-streaming-04bc37007224cfab68bc557507c449fb661218e5.tar.gz
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>
Diffstat (limited to 'libavformat/avio.h')
-rw-r--r--libavformat/avio.h3
1 files changed, 1 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 */
OpenPOWER on IntegriCloud