[FFmpeg-cvslog] Merge commit '74d318f138f2a3f1b2fe81aea826d80d1e60f54c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 24 22:03:53 2015 +0100| [eb24186b457b6b4e77b5d8ebf10a6654eebc2599] | committer: Michael Niedermayer

Merge commit '74d318f138f2a3f1b2fe81aea826d80d1e60f54c'

* commit '74d318f138f2a3f1b2fe81aea826d80d1e60f54c':
  rtsp: Fix the indentation of a linewrapped statement

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb24186b457b6b4e77b5d8ebf10a6654eebc2599
---