Merge commit '1eb57e1d9b59db0aa63348c21bf3290bd3f5efcb'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 14:21:30 +0000 (16:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 14:26:18 +0000 (16:26 +0200)
commit502a8f56b9f76e200ec363be7a891f57443bea73
tree613df87638d07e020f9d809103a389a93db1c458
parent1f249d2ca725c9ac06887116638b16be6b15f7dd
parent1eb57e1d9b59db0aa63348c21bf3290bd3f5efcb
Merge commit '1eb57e1d9b59db0aa63348c21bf3290bd3f5efcb'

* commit '1eb57e1d9b59db0aa63348c21bf3290bd3f5efcb':
  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: Michael Niedermayer <michaelni@gmx.at>