diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 13:14:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 13:14:39 +0100 |
| commit | 315f15afe74354df78b1dca711f1ed43c3d7181a (patch) | |
| tree | 84ce0d4f6d9e5f67322f701033f0f9a9f4185912 /COPYING.GPLv3 | |
| parent | 48d30f6733368f317a61901c61a78a10402eea7b (diff) | |
| parent | f811cd2d47ade37a3e66f12260807aa63375ca50 (diff) | |
| download | ffmpeg-315f15afe74354df78b1dca711f1ed43c3d7181a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtsp: Respect max_delay for the reordering queue when using custom IO
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions