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)
* 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>
1  2 
libavformat/rtsp.c

Simple merge