Commit d3f3035f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b0bdc2a7'

* commit 'b0bdc2a7':
  avutil: move av_get_time_base_q() after include rational.h

See: c7251fecMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c2cd0945 b0bdc2a7
......@@ -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);
/**
* @}
* @}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment