commit | 49778b36d39a86caeff6069cb8ccefc177135ab0 | [log] [tgz] |
---|---|---|
author | Hangyu Kuang <hkuang@google.com> | Wed Nov 09 18:43:12 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 09 18:43:13 2016 +0000 |
tree | 66a6bab77802c263c64cb979ac9804e38479e146 | |
parent | 8d029bffae6ab6592ea0f2aaa8938d04bf4c8a97 [diff] | |
parent | e1b943f21dff25044b349d4d628d9adb0c2e0b74 [diff] |
Merge changes from topic 'metadata-support' * changes: media: Limit the maximum size of per-frame metadata. media: Add metadata track support to MPEG4Writer.