RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-07 09:48:29 +00:00
Code Issues Projects Releases Wiki Activity

lavf/avio: do not include bprint.h.

Browse Source 
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:
Nicolas George 2014-07-24 09:34:10 +02:00 committed by Michael Niedermayer
parent 66ae994c54
commit 04bc370072
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/avio.h
View File

@ -31,7 +31,6 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/bprint.h"
#include "libavformat/version.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 * @return 0 for success (max_size bytes read or EOF reached), negative error
* code otherwise * 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 */ #endif /* AVFORMAT_AVIO_H */

1
libavformat/aviobuf.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/bprint.h"
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"