diff options
| author | Nicolas George <george@nsup.org> | 2014-07-24 09:34:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 05:37:45 +0200 |
| commit | 04bc37007224cfab68bc557507c449fb661218e5 (patch) | |
| tree | 31c64a55ec4c6da11f34283264357409ca2056b4 /libavformat | |
| parent | 66ae994c544a46e4f6915222d8608b3d87b39b07 (diff) | |
| download | ffmpeg-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')
| -rw-r--r-- | libavformat/avio.h | 3 | ||||
| -rw-r--r-- | libavformat/aviobuf.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index 9b168433aa..e607df5fb4 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 463d90a0d3..24c6b79097 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" |