mirror of https://git.ffmpeg.org/ffmpeg.git
Merge remote-tracking branch 'cigaes/master'
* cigaes/master: lavf/avio: do not include bprint.h. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
0f7ca2d778
|
@ -28,7 +28,6 @@
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include "libavutil/bprint.h"
|
|
||||||
#include "libavutil/common.h"
|
#include "libavutil/common.h"
|
||||||
#include "libavutil/dict.h"
|
#include "libavutil/dict.h"
|
||||||
#include "libavutil/log.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 avio_seek_time(AVIOContext *h, int stream_index,
|
||||||
int64_t timestamp, int flags);
|
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.
|
* Read contents of h into print buffer, up to max_size bytes, or up to EOF.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue