]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1':
  rtsp: Remove an outdated comment
  rtsp: Remove references to weirdly named variables in other files

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

Simple merge