Skip to content
Snippets Groups Projects
Commit c2cd0945 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '502512ea' 


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

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

See: dac7e8a9
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 4b6bb7bf 502512ea
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment