mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 12:09:55 +00:00
Merge commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8'
* commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8':
avutil: move av_get_time_base_q() after include rational.h
See: c7251fec39
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
d3f3035f08
@ -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);
|
||||
|
||||
/**
|
||||
* @}
|
||||
* @}
|
||||
|
Loading…
Reference in New Issue
Block a user