aboutsummaryrefslogtreecommitdiffstats
path: root/tests/simple1.ffconcat
diff options
context:
space:
mode:
authorRodger Combs <rodger.combs@gmail.com>2017-09-26 14:10:30 -0300
committerJames Almer <jamrial@gmail.com>2017-09-26 14:10:30 -0300
commit777d53c793a2f19b9f87d935fcb16f07ceae0dca (patch)
treece6c82e7ed338bcd994fb413156ada2e27e7ddc2 /tests/simple1.ffconcat
parent3b9ef13588360b16c22ece7521ebd9b11f9ffb17 (diff)
parent3d23a5f96ad72961c14ba3a0c2add8f2ab374b61 (diff)
downloadffmpeg-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 'tests/simple1.ffconcat')
0 files changed, 0 insertions, 0 deletions