diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-09 03:09:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-09 03:17:07 +0200 |
| commit | d4d09329eef30787da699c7a397b00f6f96940bc (patch) | |
| tree | 3605d4e30063b924254a373e270026bca6436f11 /libavformat/avio_internal.h | |
| parent | a61bc91d42945e6ccefef4867ef32d2073f8f8c7 (diff) | |
| parent | 0c68c804196400de3c40c8849124b292ed62b99c (diff) | |
| download | ffmpeg-d4d09329eef30787da699c7a397b00f6f96940bc.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
lavf: bump minor and add an APIChanges entry for avformat cleanup
lavf: get rid of ffm-specific stuff in avformat.h
Not pulled: avio: deprecate av_protocol_next().
avio: add a function for iterating though protocol names.
lavf: rename a parameter of av_sdp_create from buff->buf
lavf: rename avf_sdp_create to av_sdp_create.
lavf: make av_guess_image2_codec internal
avio: make URLProtocol internal.
avio: make URLContext internal.
lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
lavf: use designated initializers for all protocols
applehttp: don't use deprecated url_ functions.
avio: move two ff_udp_* functions from avio_internal to url.h
asfdec: remove a forgotten declaration of nonexistent function
avio: deprecate the typedef for URLInterruptCB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avio_internal.h')
| -rw-r--r-- | libavformat/avio_internal.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 0c4bd6950d..71a6846ef8 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -21,6 +21,7 @@ #define AVFORMAT_AVIO_INTERNAL_H #include "avio.h" +#include "url.h" int ffio_init_context(AVIOContext *s, unsigned char *buffer, @@ -92,10 +93,6 @@ int ffio_read_pause(AVIOContext *h, int pause); int64_t ffio_read_seek (AVIOContext *h, int stream_index, int64_t timestamp, int flags); -/* udp.c */ -int ff_udp_set_remote_url(URLContext *h, const char *uri); -int ff_udp_get_local_port(URLContext *h); - void ffio_init_checksum(AVIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), unsigned long checksum); |