diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:34:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:34:05 +0200 |
| commit | 0f7ca2d77893c87d3c6e008520f6b5549f410387 (patch) | |
| tree | 0d1989320d676157c5110bc0fde84039b73e306c | |
| parent | 287602f9d80f4a816c0e9a3a9c0d810de8dc94cb (diff) | |
| parent | f87db44685393f85c89cb338c8617e2ee6bd51f8 (diff) | |
| download | ffmpeg-0f7ca2d77893c87d3c6e008520f6b5549f410387.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavf/avio: do not include bprint.h.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avio.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index 89e0804966..2210c015a0 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. * |