]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jan 2013 12:14:32 +0000 (13:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jan 2013 12:14:39 +0000 (13:14 +0100)
commit315f15afe74354df78b1dca711f1ed43c3d7181a
tree84ce0d4f6d9e5f67322f701033f0f9a9f4185912
parent48d30f6733368f317a61901c61a78a10402eea7b
parentf811cd2d47ade37a3e66f12260807aa63375ca50
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>
libavformat/rtsp.c