diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-01 21:27:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-01 21:34:20 +0200 |
| commit | 53bf6b155cee8cdf0fd12fe49e4ccfb9cf6714a2 (patch) | |
| tree | 0247f1767a32acb9aa10785941245f2dc3fc5d3f /libavcodec/adpcmenc.c | |
| parent | b99a8e4e4a1e2043819e0507371c7617462bb8e5 (diff) | |
| parent | e3ec6fe7bb2a622a863e3912181717a659eb1bad (diff) | |
| download | ffmpeg-53bf6b155cee8cdf0fd12fe49e4ccfb9cf6714a2.tar.gz | |
Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'
* commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad':
rtsp: Add a buffer_size option
Conflicts:
libavformat/rtsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcmenc.c')
0 files changed, 0 insertions, 0 deletions