Browse Source

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>
tags/n2.3
Michael Niedermayer 11 years ago
parent
commit
d3f3035f08
1 changed files with 5 additions and 6 deletions
  1. +5
    -6
      libavutil/avutil.h

+ 5
- 6
libavutil/avutil.h View 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);

/**
* @}
* @}


Loading…
Cancel
Save