Commit 4ce9e4e9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sndio_dec: Add missing includes for av_gettime()

no change, as this has already been fixed in FFmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ae65327e fdaacc59
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