Merge commit 'cdcc370293a159c321e41af7f0eef141c62d698d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:39:29 +0000 (21:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:43:18 +0000 (21:43 +0100)
commit83f18410bdcf149b58fb669cda65b1cdcdebf695
treefe767f6d5f7e1961d5b36b74ebc4caf8920083eb
parentcce8f750d91c013da00f5191ad537450172acc0c
parentcdcc370293a159c321e41af7f0eef141c62d698d
Merge commit 'cdcc370293a159c321e41af7f0eef141c62d698d'

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

See: 22bb5bd7a3b55c25bfef130ad89e8574dd47af1d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtsp.c
libavformat/rtspdec.c