diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-21 16:43:01 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-21 11:23:22 -0500 |
| commit | b7effd4e8338f6ed5bda630ad7ed0809bf458648 (patch) | |
| tree | 53c878f6dd48c313a9bcde1855c2b4e009822c9e /libavformat/sierravmd.c | |
| parent | f8bed30d8b176fa030f6737765338bb4a2bcabc9 (diff) | |
| download | ffmpeg-b7effd4e8338f6ed5bda630ad7ed0809bf458648.tar.gz | |
avio: avio_ prefixes for get_* functions
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/sierravmd.c')
| -rw-r--r-- | libavformat/sierravmd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index e30d42deb6..323938639c 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -96,7 +96,7 @@ static int vmd_read_header(AVFormatContext *s, /* fetch the main header, including the 2 header length bytes */ url_fseek(pb, 0, SEEK_SET); - if (get_buffer(pb, vmd->vmd_header, VMD_HEADER_SIZE) != VMD_HEADER_SIZE) + if (avio_read(pb, vmd->vmd_header, VMD_HEADER_SIZE) != VMD_HEADER_SIZE) return AVERROR(EIO); if(vmd->vmd_header[16] == 'i' && vmd->vmd_header[17] == 'v' && vmd->vmd_header[18] == '3') @@ -172,7 +172,7 @@ static int vmd_read_header(AVFormatContext *s, av_free(vmd->frame_table); return AVERROR(ENOMEM); } - if (get_buffer(pb, raw_frame_table, raw_frame_table_size) != + if (avio_read(pb, raw_frame_table, raw_frame_table_size) != raw_frame_table_size) { av_free(raw_frame_table); av_free(vmd->frame_table); @@ -189,7 +189,7 @@ static int vmd_read_header(AVFormatContext *s, int type; uint32_t size; - get_buffer(pb, chunk, BYTES_PER_FRAME_RECORD); + avio_read(pb, chunk, BYTES_PER_FRAME_RECORD); type = chunk[0]; size = AV_RL32(&chunk[2]); if(!size && type != 1) @@ -250,9 +250,9 @@ static int vmd_read_packet(AVFormatContext *s, pkt->pos= url_ftell(pb); memcpy(pkt->data, frame->frame_record, BYTES_PER_FRAME_RECORD); if(vmd->is_indeo3) - ret = get_buffer(pb, pkt->data, frame->frame_size); + ret = avio_read(pb, pkt->data, frame->frame_size); else - ret = get_buffer(pb, pkt->data + BYTES_PER_FRAME_RECORD, + ret = avio_read(pb, pkt->data + BYTES_PER_FRAME_RECORD, frame->frame_size); if (ret != frame->frame_size) { |