diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-20 11:04:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-20 19:05:47 +0100 |
| commit | 471fe57e1af2bb37055c93688671c9c79ef9b5cd (patch) | |
| tree | 7f44437fe6bd0654feaba193f323b442e60049f9 /libavformat/applehttp.c | |
| parent | a8858ee11cf4f0ae22e0a9df57bec4ec5dd02f80 (diff) | |
| download | ffmpeg-471fe57e1af2bb37055c93688671c9c79ef9b5cd.tar.gz | |
avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
Diffstat (limited to 'libavformat/applehttp.c')
| -rw-r--r-- | libavformat/applehttp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c index 37a040cf34..e35aaa8ac4 100644 --- a/libavformat/applehttp.c +++ b/libavformat/applehttp.c @@ -50,13 +50,13 @@ struct segment { /* * Each variant has its own demuxer. If it currently is active, - * it has an open ByteIOContext too, and potentially an AVPacket + * it has an open AVIOContext too, and potentially an AVPacket * containing the next packet from this stream. */ struct variant { int bandwidth; char url[MAX_URL_SIZE]; - ByteIOContext *pb; + AVIOContext *pb; AVFormatContext *ctx; AVPacket pkt; int stream_offset; @@ -78,7 +78,7 @@ typedef struct AppleHTTPContext { int max_start_seq, min_end_seq; } AppleHTTPContext; -static int read_chomp_line(ByteIOContext *s, char *buf, int maxlen) +static int read_chomp_line(AVIOContext *s, char *buf, int maxlen) { int len = ff_get_line(s, buf, maxlen); while (len > 0 && isspace(buf[len - 1])) @@ -202,7 +202,7 @@ static void handle_variant_args(struct variant_info *info, const char *key, } static int parse_playlist(AppleHTTPContext *c, const char *url, - struct variant *var, ByteIOContext *in) + struct variant *var, AVIOContext *in) { int ret = 0, duration = 0, is_segment = 0, is_variant = 0, bandwidth = 0; char line[1024]; |