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/asfenc.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/asfenc.c')
-rw-r--r-- | libavformat/asfenc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 709080fbbb..4751665a56 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -202,7 +202,7 @@ typedef struct { int packet_timestamp_end; unsigned int packet_nb_payloads; uint8_t packet_buf[PACKET_SIZE]; - ByteIOContext pb; + AVIOContext pb; /* only for reading */ uint64_t data_offset; ///< beginning of the first data packet @@ -222,17 +222,17 @@ static const AVCodecTag codec_asf_bmp_tags[] = { #define PREROLL_TIME 3100 -static void put_guid(ByteIOContext *s, const ff_asf_guid *g) +static void put_guid(AVIOContext *s, const ff_asf_guid *g) { assert(sizeof(*g) == 16); put_buffer(s, *g, sizeof(*g)); } -static void put_str16(ByteIOContext *s, const char *tag) +static void put_str16(AVIOContext *s, const char *tag) { int len; uint8_t *pb; - ByteIOContext *dyn_buf; + AVIOContext *dyn_buf; if (url_open_dyn_buf(&dyn_buf) < 0) return; @@ -243,7 +243,7 @@ static void put_str16(ByteIOContext *s, const char *tag) av_freep(&pb); } -static int64_t put_header(ByteIOContext *pb, const ff_asf_guid *g) +static int64_t put_header(AVIOContext *pb, const ff_asf_guid *g) { int64_t pos; @@ -254,7 +254,7 @@ static int64_t put_header(ByteIOContext *pb, const ff_asf_guid *g) } /* update header size */ -static void end_header(ByteIOContext *pb, int64_t pos) +static void end_header(AVIOContext *pb, int64_t pos) { int64_t pos1; @@ -268,7 +268,7 @@ static void end_header(ByteIOContext *pb, int64_t pos) static void put_chunk(AVFormatContext *s, int type, int payload_length, int flags) { ASFContext *asf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int length; length = payload_length + 8; @@ -294,7 +294,7 @@ static int64_t unix_to_file_time(int ti) static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data_chunk_size) { ASFContext *asf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; AVMetadataTag *tags[5]; int header_size, n, extra_size, extra_size2, wav_extra_size, file_time; int has_title; @@ -363,7 +363,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data if (has_title) { int len; uint8_t *buf; - ByteIOContext *dyn_buf; + AVIOContext *dyn_buf; if (url_open_dyn_buf(&dyn_buf) < 0) return AVERROR(ENOMEM); @@ -479,7 +479,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data const char *desc; int len; uint8_t *buf; - ByteIOContext *dyn_buf; + AVIOContext *dyn_buf; enc = s->streams[n]->codec; p = avcodec_find_encoder(enc->codec_id); @@ -602,7 +602,7 @@ static int put_payload_parsing_info( ) { ASFContext *asf = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int ppi_size, i; int64_t start= url_ftell(pb); @@ -691,7 +691,7 @@ static void put_payload_header( ) { ASFContext *asf = s->priv_data; - ByteIOContext *pb = &asf->pb; + AVIOContext *pb = &asf->pb; int val; val = stream->num; @@ -832,7 +832,7 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt) // static int asf_write_index(AVFormatContext *s, ASFIndex *index, uint16_t max, uint32_t count) { - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int i; put_guid(pb, &ff_asf_simple_index_header); |