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

Skip to content
Commit a1c7b096 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

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

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 '6d8fae72' into gingerbread-plus-aosp

* commit '6d8fae72':
  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 2d457a32 6d8fae72
Hide 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