diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 18:50:06 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 18:50:11 +0100 |
| commit | 98e3153fa3a190df5c0a2173e134f81299606819 (patch) | |
| tree | 2e34226dbd4010774f6ffef448aab4b7d4f88544 /ffserver_config.c | |
| parent | af9cac1be1750ecc0e12c6788a3aeed1f1a778be (diff) | |
| parent | 4426540f0c3ee516662f79d0a6ab5b95503b6611 (diff) | |
| download | ffmpeg-98e3153fa3a190df5c0a2173e134f81299606819.tar.gz | |
Merge commit '4426540f0c3ee516662f79d0a6ab5b95503b6611'
This commit is a no-op. We will do this when we convert ffmpeg.c
* commit '4426540f0c3ee516662f79d0a6ab5b95503b6611':
avconv: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'ffserver_config.c')
0 files changed, 0 insertions, 0 deletions