diff options
| -rw-r--r-- | libavformat/aviobuf.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 941691adb6..0ee04b0c64 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -390,28 +390,22 @@ void init_checksum(ByteIOContext *s, /* XXX: put an inline version */ int get_byte(ByteIOContext *s) { - if (s->buf_ptr < s->buf_end) { - return *s->buf_ptr++; - } else { + if (s->buf_ptr >= s->buf_end) fill_buffer(s); if (s->buf_ptr < s->buf_end) return *s->buf_ptr++; else return 0; - } } int url_fgetc(ByteIOContext *s) { - if (s->buf_ptr < s->buf_end) { - return *s->buf_ptr++; - } else { + if (s->buf_ptr >= s->buf_end) fill_buffer(s); if (s->buf_ptr < s->buf_end) return *s->buf_ptr++; else return URL_EOF; - } } int get_buffer(ByteIOContext *s, unsigned char *buf, int size) |