Merge commit 'f77c9d71615e17414aacbb1720693b800a5a32d3' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 18:50:46 +0000 (20:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 18:50:54 +0000 (20:50 +0200)
commitefb28e3c510b7666107cd2aa25da61c9d33101b0
treee53af8bd44ab0eb8a115ed81bb8bf5a77bcb123d
parentd5f2302aca4bde75eee56a18121e0ad25a1de331
parentf77c9d71615e17414aacbb1720693b800a5a32d3
Merge commit 'f77c9d71615e17414aacbb1720693b800a5a32d3' into release/2.4

* commit 'f77c9d71615e17414aacbb1720693b800a5a32d3':
  rtsp: Make sure we don't write too many transport entries into a fixed-size array

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