diff options
author | Clément Bœsch <u@pkh.me> | 2017-04-25 19:10:39 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-04-25 19:12:05 +0200 |
commit | 91f8ccdda0605d480111f7bd3b2e1bcf8d9a1fe0 (patch) | |
tree | 766f5c1ed7f7ce4f5039cc6ede1316fb16367892 /ffserver.c | |
parent | d417e95af76c5303bd48fa9210bdecace091d656 (diff) | |
parent | 730c02326094bcfb1fa67f10a7e7b22f03f5a88f (diff) | |
download | ffmpeg-91f8ccdda0605d480111f7bd3b2e1bcf8d9a1fe0.tar.gz |
Merge commit '730c02326094bcfb1fa67f10a7e7b22f03f5a88f'
* commit '730c02326094bcfb1fa67f10a7e7b22f03f5a88f':
binkaudio: switch to the new send/receive API
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions