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)
* qatar/master:
  rtspdec: Fix keep-alive request for ACTi cameras

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

Simple merge