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/idcin.c | |
| parent | 6a786b15c34765ec00be3cd808dafbb041fd5881 (diff) | |
| download | ffmpeg-e63a362857d9807b23e65872598d782fa53bb6af.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>
(cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648)
Diffstat (limited to 'libavformat/idcin.c')
| -rw-r--r-- | libavformat/idcin.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 986714ed11..7421901a9b 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -149,11 +149,11 @@ static int idcin_read_header(AVFormatContext *s, unsigned int sample_rate, bytes_per_sample, channels; /* get the 5 header parameters */ - width = get_le32(pb); - height = get_le32(pb); - sample_rate = get_le32(pb); - bytes_per_sample = get_le32(pb); - channels = get_le32(pb); + width = avio_rl32(pb); + height = avio_rl32(pb); + sample_rate = avio_rl32(pb); + bytes_per_sample = avio_rl32(pb); + channels = avio_rl32(pb); st = av_new_stream(s, 0); if (!st) @@ -169,7 +169,7 @@ static int idcin_read_header(AVFormatContext *s, /* load up the Huffman tables into extradata */ st->codec->extradata_size = HUFFMAN_TABLE_SIZE; st->codec->extradata = av_malloc(HUFFMAN_TABLE_SIZE); - if (get_buffer(pb, st->codec->extradata, HUFFMAN_TABLE_SIZE) != + if (avio_read(pb, st->codec->extradata, HUFFMAN_TABLE_SIZE) != HUFFMAN_TABLE_SIZE) return AVERROR(EIO); /* save a reference in order to transport the palette */ @@ -231,13 +231,13 @@ static int idcin_read_packet(AVFormatContext *s, return AVERROR(EIO); if (idcin->next_chunk_is_video) { - command = get_le32(pb); + command = avio_rl32(pb); if (command == 2) { return AVERROR(EIO); } else if (command == 1) { /* trigger a palette change */ idcin->palctrl.palette_changed = 1; - if (get_buffer(pb, palette_buffer, 768) != 768) + if (avio_read(pb, palette_buffer, 768) != 768) return AVERROR(EIO); /* scale the palette as necessary */ palette_scale = 2; @@ -255,7 +255,7 @@ static int idcin_read_packet(AVFormatContext *s, } } - chunk_size = get_le32(pb); + chunk_size = avio_rl32(pb); /* skip the number of decoded bytes (always equal to width * height) */ url_fseek(pb, 4, SEEK_CUR); chunk_size -= 4; |