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/filmstripdec.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/filmstripdec.c')
| -rw-r--r-- | libavformat/filmstripdec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c index 262bb23390..87219c83ff 100644 --- a/libavformat/filmstripdec.c +++ b/libavformat/filmstripdec.c @@ -44,7 +44,7 @@ static int read_header(AVFormatContext *s, return AVERROR(EIO); url_fseek(pb, url_fsize(pb) - 36, SEEK_SET); - if (get_be32(pb) != RAND_TAG) { + if (avio_rb32(pb) != RAND_TAG) { av_log(s, AV_LOG_ERROR, "magic number not found"); return AVERROR_INVALIDDATA; } @@ -53,8 +53,8 @@ static int read_header(AVFormatContext *s, if (!st) return AVERROR(ENOMEM); - st->nb_frames = get_be32(pb); - if (get_be16(pb) != 0) { + st->nb_frames = avio_rb32(pb); + if (avio_rb16(pb) != 0) { av_log_ask_for_sample(s, "unsupported packing method\n"); return AVERROR_INVALIDDATA; } @@ -64,10 +64,10 @@ static int read_header(AVFormatContext *s, st->codec->codec_id = CODEC_ID_RAWVIDEO; st->codec->pix_fmt = PIX_FMT_RGBA; st->codec->codec_tag = 0; /* no fourcc */ - st->codec->width = get_be16(pb); - st->codec->height = get_be16(pb); - film->leading = get_be16(pb); - av_set_pts_info(st, 64, 1, get_be16(pb)); + st->codec->width = avio_rb16(pb); + st->codec->height = avio_rb16(pb); + film->leading = avio_rb16(pb); + av_set_pts_info(st, 64, 1, avio_rb16(pb)); url_fseek(pb, 0, SEEK_SET); |