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/flacdec.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/flacdec.c')
| -rw-r--r-- | libavformat/flacdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index f971d0997c..bed9863f9a 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -40,14 +40,14 @@ static int flac_read_header(AVFormatContext *s, /* the parameters will be extracted from the compressed bitstream */ /* if fLaC marker is not found, assume there is no header */ - if (get_le32(s->pb) != MKTAG('f','L','a','C')) { + if (avio_rl32(s->pb) != MKTAG('f','L','a','C')) { url_fseek(s->pb, -4, SEEK_CUR); return 0; } /* process metadata blocks */ while (!url_feof(s->pb) && !metadata_last) { - get_buffer(s->pb, header, 4); + avio_read(s->pb, header, 4); ff_flac_parse_block_header(header, &metadata_last, &metadata_type, &metadata_size); switch (metadata_type) { @@ -58,7 +58,7 @@ static int flac_read_header(AVFormatContext *s, if (!buffer) { return AVERROR(ENOMEM); } - if (get_buffer(s->pb, buffer, metadata_size) != metadata_size) { + if (avio_read(s->pb, buffer, metadata_size) != metadata_size) { av_freep(&buffer); return AVERROR(EIO); } |