Merge commit '3d23a5f9'

* commit '3d23a5f9': dashenc: add support for assigning streams to AdaptationSets Merged-by: Rodger Combs <rodger.combs@gmail.com>

Merge commit '3d23a5f9'
* commit '3d23a5f9': dashenc: add support for assigning streams to AdaptationSets Merged-by: Rodger Combs <rodger.combs@gmail.com>
777d53c7 · Rodger Combs · James Almer · 3b9ef135 · 3d23a5f9 · 777d53c7
Commit 777d53c7 authored Sep 26, 2017 by Rodger Combs Committed by James Almer Sep 26, 2017
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 180 additions and 43 deletions

dashenc.c libavformat/dashenc.c +180 -43

No files found.
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c