Commit c2cd0945 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '502512ea'

* commit '502512ea':
  avutil: Add av_get_time_base_q()

Conflicts:
	doc/APIchanges
	libavutil/utils.c
	libavutil/version.h

See: dac7e8a9Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4b6bb7bf 502512ea
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment