Changeset 872e0873 in ffmpeg

Timestamp:

Oct 24, 2014, 10:19:35 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2896b98

Parents:

63001833 (diff), 248d8fb6 (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> (10/24/14 10:16:09)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/24/14 10:19:35)

Message:

Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'

• commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72': avplay: Use av_gettime_relative

Conflicts:

ffplay.c

See: 0ca0b4c29cf750cbb15732cddbe16723a66afda8
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)