Merge commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 22:46:28 +0000 (00:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 22:48:02 +0000 (00:48 +0200)
* commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8':
  avutil: move av_get_time_base_q() after include rational.h

See: c7251fec39c5b54470bb295acfc81d89683843c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/avutil.h

index 5dfbcaf..cd7dc85 100644 (file)
@@ -290,12 +290,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
 #include "log.h"
 #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.
  */
@@ -332,6 +326,11 @@ unsigned av_int_list_length_for_size(unsigned elsize,
  */
 FILE *av_fopen_utf8(const char *path, const char *mode);
 
+/**
+ * Return the fractional representation of the internal time base.
+ */
+AVRational av_get_time_base_q(void);
+
 /**
  * @}
  * @}