summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-22 22:44:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-22 22:44:14 +0200
commitc7251fec39c5b54470bb295acfc81d89683843c7 (patch)
tree0495e6fda0d44e3678244cd76ee204d2f427e1d6
parentdac7e8a94e49e41f1dd0af34dc17d124d5b156ba (diff)
downloadffmpeg-streaming-c7251fec39c5b54470bb295acfc81d89683843c7.zip
ffmpeg-streaming-c7251fec39c5b54470bb295acfc81d89683843c7.tar.gz
avutil: move av_get_time_base_q() after include rational.h
Fix compilation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/avutil.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 3b644f9..5dfbcaf 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -247,11 +247,6 @@ const char *av_get_media_type_string(enum AVMediaType media_type);
#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE}
/**
- * Return the fractional representation of the internal time base.
- */
-AVRational av_get_time_base_q(void);
-
-/**
* @}
* @}
* @defgroup lavu_picture Image related
@@ -296,6 +291,12 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
#include "pixfmt.h"
/**
+ * Return the fractional representation of the internal time base.
+ */
+AVRational av_get_time_base_q(void);
+
+
+/**
* Return x default pointer in case p is NULL.
*/
static inline void *av_x_if_null(const void *p, const void *x)
OpenPOWER on IntegriCloud