Skip to content

F
ffmpeg.wasm-core
Commit 872e0873 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '248d8fb6' 

* commit '248d8fb6':
  avplay: Use av_gettime_relative

Conflicts:
	ffplay.c

See: 0ca0b4c2Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 63001833 248d8fb6
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
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