diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-21 16:43:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-22 02:44:37 +0100 |
| commit | e63a362857d9807b23e65872598d782fa53bb6af (patch) | |
| tree | 7a21287e54bfbd2ec9c45bcb5a22e441e4992f2b /libavformat/4xm.c | |
| parent | 6a786b15c34765ec00be3cd808dafbb041fd5881 (diff) | |
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>
(cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648)
Diffstat (limited to 'libavformat/4xm.c')
| -rw-r--r-- | libavformat/4xm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 033c962fda..bf2d7384b5 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -54,11 +54,11 @@ #define strk_SIZE 0x28 #define GET_LIST_HEADER() \ - fourcc_tag = get_le32(pb); \ - size = get_le32(pb); \ + fourcc_tag = avio_rl32(pb); \ + size = avio_rl32(pb); \ if (fourcc_tag != LIST_TAG) \ return AVERROR_INVALIDDATA; \ - fourcc_tag = get_le32(pb); + fourcc_tag = avio_rl32(pb); typedef struct AudioTrack { int sample_rate; @@ -118,7 +118,7 @@ static int fourxm_read_header(AVFormatContext *s, header = av_malloc(header_size); if (!header) return AVERROR(ENOMEM); - if (get_buffer(pb, header, header_size) != header_size){ + if (avio_read(pb, header, header_size) != header_size){ av_free(header); return AVERROR(EIO); } @@ -255,7 +255,7 @@ static int fourxm_read_packet(AVFormatContext *s, while (!packet_read) { - if ((ret = get_buffer(s->pb, header, 8)) < 0) + if ((ret = avio_read(s->pb, header, 8)) < 0) return ret; fourcc_tag = AV_RL32(&header[0]); size = AV_RL32(&header[4]); @@ -268,7 +268,7 @@ static int fourxm_read_packet(AVFormatContext *s, fourxm->video_pts ++; /* skip the LIST-* tag and move on to the next fourcc */ - get_le32(pb); + avio_rl32(pb); break; case ifrm_TAG: @@ -285,7 +285,7 @@ static int fourxm_read_packet(AVFormatContext *s, pkt->pts = fourxm->video_pts; pkt->pos = url_ftell(s->pb); memcpy(pkt->data, header, 8); - ret = get_buffer(s->pb, &pkt->data[8], size); + ret = avio_read(s->pb, &pkt->data[8], size); if (ret < 0){ av_free_packet(pkt); @@ -294,8 +294,8 @@ static int fourxm_read_packet(AVFormatContext *s, break; case snd__TAG: - track_number = get_le32(pb); - out_size= get_le32(pb); + track_number = avio_rl32(pb); + out_size= avio_rl32(pb); size-=8; if (track_number < fourxm->track_count && fourxm->tracks[track_number].channels>0) { |