OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 23:40:54 +0000 (00:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 23:41:02 +0000 (00:41 +0100)
commit3efe5e3b094ae8561b31416adb80de33ccd04234
tree0f055b630f5d3cb5da8587b57b65e88ac1356c2c
parent44967ab60a9baf62f86bc727b51ff0acb587e676
parent70e981cf5d75abc9bff076969270b587a0004d3f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtspdec: Fix keep-alive request for ACTi cameras

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtspdec.c