Skip to content
Snippets Groups Projects
Commit 315f15af authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge remote-tracking branch 'qatar/master' 


* qatar/master:
  rtsp: Respect max_delay for the reordering queue when using custom IO

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 48d30f67 f811cd2d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 1 deletion
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