diff options
| -rw-r--r-- | libavformat/act.c | 4 | ||||
| -rw-r--r-- | libavformat/asfdec.c | 2 | ||||
| -rw-r--r-- | libavformat/bintext.c | 16 | ||||
| -rw-r--r-- | libavformat/g723_1.c | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/libavformat/act.c b/libavformat/act.c index a21f2a3433..6e2772c733 100644 --- a/libavformat/act.c +++ b/libavformat/act.c @@ -126,7 +126,7 @@ static int read_packet(AVFormatContext *s, if(s->streams[0]->codec->sample_rate==4400 && !ctx->second_packet) { - ret = get_buffer(pb, ctx->audio_buffer, frame_size); + ret = avio_read(pb, ctx->audio_buffer, frame_size); if(ret<0) return ret; @@ -165,7 +165,7 @@ static int read_packet(AVFormatContext *s, } else // 8000 Hz { - ret = get_buffer(pb, ctx->audio_buffer, frame_size); + ret = avio_read(pb, ctx->audio_buffer, frame_size); if(ret<0) return ret; diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 6cd771ee89..47fde899fb 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -166,7 +166,7 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len) if (type == 0) { // UTF16-LE avio_get_str16le(s->pb, len, value, 2*len + 1); } else if (type == -1) { // ASCII - get_buffer(s->pb, value, len); + avio_read(s->pb, value, len); value[len]=0; } else if (type > 1 && type <= 5) { // boolean or DWORD or QWORD or WORD uint64_t num = get_value(s->pb, type); diff --git a/libavformat/bintext.c b/libavformat/bintext.c index aa668a0966..b91f91ca54 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -65,7 +65,7 @@ static int next_tag_read(AVFormatContext *avctx, uint64_t *fsize) uint64_t start_pos = url_fsize(pb) - 256; avio_seek(pb, start_pos, SEEK_SET); - if (get_buffer(pb, buf, sizeof(next_magic)) != sizeof(next_magic)) + if (avio_read(pb, buf, sizeof(next_magic)) != sizeof(next_magic)) return -1; if (memcmp(buf, next_magic, sizeof(next_magic))) return -1; @@ -78,7 +78,7 @@ static int next_tag_read(AVFormatContext *avctx, uint64_t *fsize) len = get_byte(pb); \ if (len < 1 || len > size) \ return -1; \ - if (get_buffer(pb, buf, size) == size && *buf) { \ + if (avio_read(pb, buf, size) == size && *buf) { \ buf[len] = 0; \ av_metadata_set2(&avctx->metadata, name, buf, 0); \ } @@ -197,7 +197,7 @@ static int xbin_read_header(AVFormatContext *s, return AVERROR(ENOMEM); st->codec->extradata[0] = fontheight; st->codec->extradata[1] = flags; - if (get_buffer(pb, st->codec->extradata + 2, st->codec->extradata_size - 2) < 0) + if (avio_read(pb, st->codec->extradata + 2, st->codec->extradata_size - 2) < 0) return AVERROR(EIO); if (!url_is_streamed(pb)) { @@ -233,12 +233,12 @@ static int adf_read_header(AVFormatContext *s, st->codec->extradata[0] = 16; st->codec->extradata[1] = BINTEXT_PALETTE|BINTEXT_FONT; - if (get_buffer(pb, st->codec->extradata + 2, 24) < 0) + if (avio_read(pb, st->codec->extradata + 2, 24) < 0) return AVERROR(EIO); url_fskip(pb, 144); - if (get_buffer(pb, st->codec->extradata + 2 + 24, 24) < 0) + if (avio_read(pb, st->codec->extradata + 2 + 24, 24) < 0) return AVERROR(EIO); - if (get_buffer(pb, st->codec->extradata + 2 + 48, 4096) < 0) + if (avio_read(pb, st->codec->extradata + 2 + 48, 4096) < 0) return AVERROR(EIO); if (!url_is_streamed(pb)) { @@ -293,9 +293,9 @@ static int idf_read_header(AVFormatContext *s, avio_seek(pb, avio_size(pb) - 4096 - 48, SEEK_SET); - if (get_buffer(pb, st->codec->extradata + 2 + 48, 4096) < 0) + if (avio_read(pb, st->codec->extradata + 2 + 48, 4096) < 0) return AVERROR(EIO); - if (get_buffer(pb, st->codec->extradata + 2, 48) < 0) + if (avio_read(pb, st->codec->extradata + 2, 48) < 0) return AVERROR(EIO); bin->fsize = url_fsize(pb) - 12 - 4096 - 48; diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index 5bdd764363..ecf3d0da03 100644 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -62,7 +62,7 @@ static int g723_1_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->duration = 240; pkt->stream_index = 0; - ret = get_buffer(s->pb, pkt->data + 1, size - 1); + ret = avio_read(s->pb, pkt->data + 1, size - 1); if (ret < size - 1) { av_free_packet(pkt); return ret < 0 ? ret : AVERROR_EOF; |