Merge commit '502512ea0f179165782777265f441d4061ff6012'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 22:37:16 +0000 (00:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 22:38:39 +0000 (00:38 +0200)
commitc2cd0945c9aea2ad3a9cd3fdf7e95020ab4d6536
tree1776e28c0bd2bdf958834417b7bdf308853124a3
parent4b6bb7bfe18f10c6e5b434559ca1cf98268c2704
parent502512ea0f179165782777265f441d4061ff6012
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>