diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 00:46:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 00:48:02 +0200 |
| commit | d3f3035f0857d04b1f7c5b1d44c7f3f0972638a0 (patch) | |
| tree | 81d48e3d4e780bf213c524caf6838c9f364dabd5 | |
| parent | c2cd0945c9aea2ad3a9cd3fdf7e95020ab4d6536 (diff) | |
| parent | b0bdc2a7123abd0287de435726ab68e9e475a8d8 (diff) | |
| download | ffmpeg-streaming-d3f3035f0857d04b1f7c5b1d44c7f3f0972638a0.zip ffmpeg-streaming-d3f3035f0857d04b1f7c5b1d44c7f3f0972638a0.tar.gz | |
Merge commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8'
* commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8':
avutil: move av_get_time_base_q() after include rational.h
See: c7251fec39c5b54470bb295acfc81d89683843c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/avutil.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 5dfbcaf..cd7dc85 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -291,12 +291,6 @@ 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) @@ -333,6 +327,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); + +/** * @} * @} */ |
