summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/4/changes.html
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-09-24 15:20:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-24 15:20:35 -0700
commit0b783bc2e4ea2454fda4107d559eefee36b19623 (patch)
treea4c7b524a64e2b74aff8d950f8abf3cdb2804b94 /docs/html/sdk/api_diff/4/changes.html
parent253ce3196092de15161c4679cf2bf16b85243979 (diff)
parenta1c7b096dfadc9ba7ee2ef432569eb3180f9bf34 (diff)
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 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34' * commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34': 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.
Diffstat (limited to 'docs/html/sdk/api_diff/4/changes.html')
0 files changed, 0 insertions, 0 deletions