diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 16:40:20 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 16:40:20 -0300 |
| commit | 28e012234a9bf9118a69a324de6392ce64fb65d2 (patch) | |
| tree | d47907c200a1cd9f91b01db90c10767a4e686124 /libavformat/dss.c | |
| parent | d80abb645f8d2eb3bb8e4c9b95c48e6000c49174 (diff) | |
| parent | 4f6401df43d7ee9082ea591037b9f9284217d834 (diff) | |
| download | ffmpeg-28e012234a9bf9118a69a324de6392ce64fb65d2.tar.gz | |
Merge commit '4f6401df43d7ee9082ea591037b9f9284217d834'
* commit '4f6401df43d7ee9082ea591037b9f9284217d834':
configure: Merge separate parts of GnuTLS test
configure: Simplify nvenc check (and move it to the correct spot)
configure: Drop fallback for deprecated avserver command line options
configure: Drop feature for randomly disabling/enabling components
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/dss.c')
0 files changed, 0 insertions, 0 deletions