Commit 502a8f56 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1eb57e1d'

* commit '1eb57e1d':
  lavc: eliminate tb_unreliable()

Conflicts:
	libavformat/utils.c

tb_unreliable() is used in several other parts of libavformat and thus isnt removed
The remaining change is a removial of a call to tb_unreliable() which would cause
a practically unconditional delay of about 1 second in startup for live streams.
I will implement what the commit message claims the change should do in the next
commit

This is thus, not merged
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1f249d2c 1eb57e1d
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