diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-28 16:21:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-28 16:26:18 +0200 |
| commit | 502a8f56b9f76e200ec363be7a891f57443bea73 (patch) | |
| tree | 613df87638d07e020f9d809103a389a93db1c458 /libavcodec/lclenc.c | |
| parent | 1f249d2ca725c9ac06887116638b16be6b15f7dd (diff) | |
| parent | 1eb57e1d9b59db0aa63348c21bf3290bd3f5efcb (diff) | |
| download | ffmpeg-502a8f56b9f76e200ec363be7a891f57443bea73.tar.gz | |
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>
Diffstat (limited to 'libavcodec/lclenc.c')
0 files changed, 0 insertions, 0 deletions