diff options
| author | Rodger Combs <rodger.combs@gmail.com> | 2017-09-26 14:10:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-26 14:10:30 -0300 |
| commit | 777d53c793a2f19b9f87d935fcb16f07ceae0dca (patch) | |
| tree | ce6c82e7ed338bcd994fb413156ada2e27e7ddc2 /libswresample/x86 | |
| parent | 3b9ef13588360b16c22ece7521ebd9b11f9ffb17 (diff) | |
| parent | 3d23a5f96ad72961c14ba3a0c2add8f2ab374b61 (diff) | |
| download | ffmpeg-777d53c793a2f19b9f87d935fcb16f07ceae0dca.tar.gz | |
Merge commit '3d23a5f96ad72961c14ba3a0c2add8f2ab374b61'
* commit '3d23a5f96ad72961c14ba3a0c2add8f2ab374b61':
dashenc: add support for assigning streams to AdaptationSets
Merged-by: Rodger Combs <rodger.combs@gmail.com>
Diffstat (limited to 'libswresample/x86')
0 files changed, 0 insertions, 0 deletions