[FFmpeg-cvslog] Merge commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 12 13:14:00 2013 +0100| [e730c3a2cbc4070f3e1799d2a6789f239f7377b1] | committer: Michael Niedermayer

Merge commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1'

* commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1':
  rtsp: Remove an outdated comment
  rtsp: Remove references to weirdly named variables in other files

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

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