Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Apr 2015 19:27:45 +0000 (21:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Apr 2015 19:34:20 +0000 (21:34 +0200)
commit53bf6b155cee8cdf0fd12fe49e4ccfb9cf6714a2
tree0247f1767a32acb9aa10785941245f2dc3fc5d3f
parentb99a8e4e4a1e2043819e0507371c7617462bb8e5
parente3ec6fe7bb2a622a863e3912181717a659eb1bad
Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'

* commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad':
  rtsp: Add a buffer_size option

Conflicts:
libavformat/rtsp.c

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