* commit '502512ea0f179165782777265f441d4061ff6012': avutil: Add av_get_time_base_q() Conflicts: doc/APIchanges libavutil/utils.c libavutil/version.h See: dac7e8a94e Merged-by: Michael Niedermayer <michaelni@gmx.at>
dac7e8a94e