* UINTX -> uintx_t INTX -> intx_t

Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 11 insertions, 11 deletions

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 4ed359c1db..29e9489d60 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -3,7 +3,7 @@
 
 /* output byte stream handling */
 
-typedef INT64 offset_t;
+typedef int64_t offset_t;
 
 /* unbuffered I/O */
 
@@ -60,8 +60,8 @@ typedef struct {
     int buffer_size;
     unsigned char *buf_ptr, *buf_end;
     void *opaque;
-    int (*read_packet)(void *opaque, UINT8 *buf, int buf_size);
-    void (*write_packet)(void *opaque, UINT8 *buf, int buf_size);
+    int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
+    void (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
     int (*seek)(void *opaque, offset_t offset, int whence);
     offset_t pos; /* position in the file of the current buffer */
     int must_flush; /* true if the next seek should flush */
@@ -76,14 +76,14 @@ int init_put_byte(ByteIOContext *s,
                   int buffer_size,
                   int write_flag,
                   void *opaque,
-                  int (*read_packet)(void *opaque, UINT8 *buf, int buf_size),
-                  void (*write_packet)(void *opaque, UINT8 *buf, int buf_size),
+                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  void (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
                   int (*seek)(void *opaque, offset_t offset, int whence));
 
 void put_byte(ByteIOContext *s, int b);
 void put_buffer(ByteIOContext *s, const unsigned char *buf, int size);
-void put_le64(ByteIOContext *s, UINT64 val);
-void put_be64(ByteIOContext *s, UINT64 val);
+void put_le64(ByteIOContext *s, uint64_t val);
+void put_be64(ByteIOContext *s, uint64_t val);
 void put_le32(ByteIOContext *s, unsigned int val);
 void put_be32(ByteIOContext *s, unsigned int val);
 void put_le16(ByteIOContext *s, unsigned int val);
@@ -108,14 +108,14 @@ void put_flush_packet(ByteIOContext *s);
 int get_buffer(ByteIOContext *s, unsigned char *buf, int size);
 int get_byte(ByteIOContext *s);
 unsigned int get_le32(ByteIOContext *s);
-UINT64 get_le64(ByteIOContext *s);
+uint64_t get_le64(ByteIOContext *s);
 unsigned int get_le16(ByteIOContext *s);
 
 double get_be64_double(ByteIOContext *s);
 char *get_strz(ByteIOContext *s, char *buf, int maxlen);
 unsigned int get_be16(ByteIOContext *s);
 unsigned int get_be32(ByteIOContext *s);
-UINT64 get_be64(ByteIOContext *s);
+uint64_t get_be64(ByteIOContext *s);
 
 static inline int url_is_streamed(ByteIOContext *s)
 {
@@ -129,12 +129,12 @@ int url_fclose(ByteIOContext *s);
 URLContext *url_fileno(ByteIOContext *s);
 int url_fget_max_packet_size(ByteIOContext *s);
 
-int url_open_buf(ByteIOContext *s, UINT8 *buf, int buf_size, int flags);
+int url_open_buf(ByteIOContext *s, uint8_t *buf, int buf_size, int flags);
 int url_close_buf(ByteIOContext *s);
 
 int url_open_dyn_buf(ByteIOContext *s);
 int url_open_dyn_packet_buf(ByteIOContext *s, int max_packet_size);
-int url_close_dyn_buf(ByteIOContext *s, UINT8 **pbuffer);
+int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer);
 
 /* file.c */
 extern URLProtocol file_protocol;