mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-02 14:33:23 +02:00
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>
This commit is contained in:
parent
66ae994c54
commit
04bc370072
@ -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 */
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user