[FFmpeg-cvslog] Merge commit 'cdcc370293a159c321e41af7f0eef141c62d698d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 23 21:39:29 2015 +0100| [83f18410bdcf149b58fb669cda65b1cdcdebf695] | committer: Michael Niedermayer

Merge commit 'cdcc370293a159c321e41af7f0eef141c62d698d'

* commit 'cdcc370293a159c321e41af7f0eef141c62d698d':
  rtsp: punch holes again after pause

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

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