Changeset c2cd0945 in ffmpeg

Timestamp:

Apr 22, 2014, 10:38:39 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d3f3035f

Parents:

4b6bb7bf (diff), 502512ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/22/14 22:37:16)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/22/14 22:38:39)

Message:

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>

(No files)