Merge commit 'b90adb0aba073f9c1b4abca852119947393ced4c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 18:37:47 +0000 (20:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 18:37:51 +0000 (20:37 +0200)
commit10a28e8a08d609b9f8352c221845d15cd0021675
treeb5453be264e6a1d3ce5b9e73abade748cadaaba0
parent97f074f134048276db2f2c552e6e6b24fe0a6894
parentb90adb0aba073f9c1b4abca852119947393ced4c
Merge commit 'b90adb0aba073f9c1b4abca852119947393ced4c'

* commit 'b90adb0aba073f9c1b4abca852119947393ced4c':
  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