[FFmpeg-cvslog] Merge commit '1eb57e1d9b59db0aa63348c21bf3290bd3f5efcb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 28 16:21:30 2014 +0200| [502a8f56b9f76e200ec363be7a891f57443bea73] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=502a8f56b9f76e200ec363be7a891f57443bea73
---