# HG changeset patch
# User reimar
# Date 1280068420 0
# Node ID daed56aa74bc2751105dd2b50398042951d96ed3
# Parent  3d61da0c6e4164fc7bdc6d2aabf5d439bd9ae2c2
Simplify get_byte and url_fgetc.

diff -r 3d61da0c6e41 -r daed56aa74bc aviobuf.c
--- a/aviobuf.c	Sun Jul 25 07:54:33 2010 +0000
+++ b/aviobuf.c	Sun Jul 25 14:33:40 2010 +0000
@@ -390,28 +390,22 @@
 /* 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)