diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 00:37:16 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 00:38:39 +0200 |
commit | c2cd0945c9aea2ad3a9cd3fdf7e95020ab4d6536 (patch) | |
tree | 1776e28c0bd2bdf958834417b7bdf308853124a3 /libavutil/avutil.h | |
parent | 4b6bb7bfe18f10c6e5b434559ca1cf98268c2704 (diff) | |
parent | 502512ea0f179165782777265f441d4061ff6012 (diff) | |
download | ffmpeg-c2cd0945c9aea2ad3a9cd3fdf7e95020ab4d6536.tar.gz |
Merge commit '502512ea0f179165782777265f441d4061ff6012'
* commit '502512ea0f179165782777265f441d4061ff6012':
avutil: Add av_get_time_base_q()
Conflicts:
doc/APIchanges
libavutil/utils.c
libavutil/version.h
See: dac7e8a94e49e41f1dd0af34dc17d124d5b156ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/avutil.h')
0 files changed, 0 insertions, 0 deletions