diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-14 02:43:12 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-14 03:33:39 +0400 |
| commit | 5f268ca5c57f3ad3050b58f513651c17304d3653 (patch) | |
| tree | f66ad7e5c4fd5656db9a95218f2ad433a982d81b /libavformat/avio_internal.h | |
| parent | 4fa6e9d0b40653010b35278f7e8b556958341205 (diff) | |
| parent | 32caa7b13cecca59213c73fa94dd683c2b003bfd (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: pass options from AVFormatContext to avio.
avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
avio: add avio_open2, taking an interrupt callback and options
avio: add support for passing options to protocols.
avio: add and use ffurl_protocol_next().
avformat: Pass the interrupt callback on to chained muxers/demuxers
avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc
avformat: Use ff_check_interrupt
avio: Add an internal utility function for checking the new interrupt callback
avio: Add AVIOInterruptCB
texi2html: remove stray \n
doc: prettyfy the texi2html documentation
swscale: handle unaligned buffers in yuv2plane1
Conflicts:
libavformat/avformat.h
libavformat/avio.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avio_internal.h')
| -rw-r--r-- | libavformat/avio_internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 4c80163d31..f140897c5d 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -23,6 +23,10 @@ #include "avio.h" #include "url.h" +#include "libavutil/log.h" + +extern const AVClass ffio_url_class; + int ffio_init_context(AVIOContext *s, unsigned char *buffer, int buffer_size, |