Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b783bc2 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am a1c7b096: am 6d8fae72: Merge "Instead of just writing one track to the .mp4... 

am a1c7b096: am 6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread

Merge commit 'a1c7b096'

* commit 'a1c7b096':
  Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
parents 253ce319 a1c7b096
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment