diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-11-14 01:19:56 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2011-11-14 07:22:31 +0100 |
| commit | 055cda8acccad3e7414132cddf0dc4e22b1ae00b (patch) | |
| tree | 2701fb28fcb20094b5c0f851dbb980110ea31fda | |
| parent | f3c47e4100993040bab67285d373e54325259d9a (diff) | |
| download | ffmpeg-055cda8acccad3e7414132cddf0dc4e22b1ae00b.tar.gz | |
Rename remaining get_byte to avio_r8.
| -rw-r--r-- | libavformat/act.c | 2 | ||||
| -rw-r--r-- | libavformat/bintext.c | 10 | ||||
| -rw-r--r-- | libavformat/g723_1.c | 2 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/act.c b/libavformat/act.c index 6e2772c733..329d0b026c 100644 --- a/libavformat/act.c +++ b/libavformat/act.c @@ -94,7 +94,7 @@ static int read_header(AVFormatContext *s, avio_seek(pb, 257, SEEK_SET); msec=get_le16(pb); - sec=get_byte(pb); + sec=avio_r8(pb); min=get_le32(pb); st->duration = av_rescale(1000*(min*60+sec)+msec, st->codec->sample_rate, 1000 * st->codec->frame_size); diff --git a/libavformat/bintext.c b/libavformat/bintext.c index 538c0aff57..7f99d013a8 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -69,13 +69,13 @@ static int next_tag_read(AVFormatContext *avctx, uint64_t *fsize) return -1; if (memcmp(buf, next_magic, sizeof(next_magic))) return -1; - if (get_byte(pb) != 0x01) + if (avio_r8(pb) != 0x01) return -1; *fsize -= 256; #define GET_EFI2_META(name,size) \ - len = get_byte(pb); \ + len = avio_r8(pb); \ if (len < 1 || len > size) \ return -1; \ if (avio_read(pb, buf, size) == size && *buf) { \ @@ -181,9 +181,9 @@ static int xbin_read_header(AVFormatContext *s, url_fskip(pb, 5); st->codec->width = get_le16(pb)<<3; st->codec->height = get_le16(pb); - fontheight = get_byte(pb); + fontheight = avio_r8(pb); st->codec->height *= fontheight; - flags = get_byte(pb); + flags = avio_r8(pb); st->codec->extradata_size = 2; if ((flags & BINTEXT_PALETTE)) @@ -218,7 +218,7 @@ static int adf_read_header(AVFormatContext *s, AVIOContext *pb = s->pb; AVStream *st; - if (get_byte(pb) != 1) + if (avio_r8(pb) != 1) return AVERROR_INVALIDDATA; st = init_stream(s, ap); diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index ecf3d0da03..56ab3da6ad 100644 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -51,7 +51,7 @@ static int g723_1_read_packet(AVFormatContext *s, AVPacket *pkt) int size, byte, ret; pkt->pos = url_ftell(s->pb); - byte = get_byte(s->pb); + byte = avio_r8(s->pb); size = frame_size[byte & 3]; ret = av_new_packet(pkt, size); diff --git a/libavformat/mov.c b/libavformat/mov.c index 51dd3eb498..668ff89b4f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1305,7 +1305,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) st->codec->flags2 |= CODEC_FLAG2_DROP_FRAME_TIMECODE; avio_rb32(pb); avio_rb32(pb); - st->codec->time_base.den = get_byte(pb); + st->codec->time_base.den = avio_r8(pb); st->codec->time_base.num = 1; } /* other codec type, just skip (rtp, mp4s, ...) */ |