Merge commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Jan 2013 12:14:00 +0000 (13:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Jan 2013 12:14:05 +0000 (13:14 +0100)
commite730c3a2cbc4070f3e1799d2a6789f239f7377b1
tree6e63062ae1b712ab9fa91fa35658a54b019bac91
parentdda2d2974863cb862f63fc1927d1d9ad5733555b
parent54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1
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@gmx.at>
libavformat/rtsp.c