From af02073225e5b34a8ea72bd3ff531868ed0b5061 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 14 Mar 2011 20:39:01 +0100
Subject: [PATCH] avio: change avio_tell/skip from macros to inline functions

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
---
 libavformat/avio.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 36be9fe4dd..9f45a6bd87 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -487,13 +487,19 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
  * Skip given number of bytes forward
  * @return new position or AVERROR.
  */
-#define avio_skip(s, offset) avio_seek(s, offset, SEEK_CUR)
+static av_always_inline int64_t avio_skip(AVIOContext *s, int64_t offset)
+{
+    return avio_seek(s, offset, SEEK_CUR);
+}
 
 /**
  * ftell() equivalent for AVIOContext.
  * @return position or AVERROR.
  */
-#define avio_tell(s) avio_seek((s), 0, SEEK_CUR)
+static av_always_inline int64_t avio_tell(AVIOContext *s)
+{
+    return avio_seek(s, 0, SEEK_CUR);
+}
 
 /**
  * Get the filesize.