mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'
* commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72':
avplay: Use av_gettime_relative
Conflicts:
ffplay.c
See: 0ca0b4c29c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
872e087305