virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Merge commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8'

Browse Source 
* 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:
Michael Niedermayer 2014-04-23 00:46:28 +02:00
commit d3f3035f08
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavutil/avutil.h
View File

@ -290,12 +290,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
#include "log.h" #include "log.h"
#include "pixfmt.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. * 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); 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);
/** /**
* @} * @}
* @} * @}