Commits · cf199260de131420b5be51be9ddda9561e7e30d4 · halo / frameworks_av

15 Oct, 2016 17 commits

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: am:... · cf199260

Marco Nelissen authored 8 years ago

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a am: 4c31eb26 -s ours am: db358e20 am: d03ad914 am: 92106db5 am: d27738c9 -s ours am: 9934c7d7
am: ccf25186

Change-Id: I10af6a46cfe4371c3829196c4dc840e5d2a01298

cf199260

DO NOT MERGE Fix divide by zero am: am: -s ours am:... · 83476806

Marco Nelissen authored 8 years ago

DO NOT MERGE Fix divide by zero am: bc08b17c am: 7525a44f -s ours am: 9c6eda24 am: 9872d49f am: 9195b00e am: ae5c6c5a -s ours am: a303b610
am: c5c549f4

Change-Id: I18d235ad8d7085c8b23611eed5728d18c89912b9

83476806

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: am:... · ccf25186

Marco Nelissen authored 8 years ago

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a am: 4c31eb26 -s ours am: db358e20 am: d03ad914 am: 92106db5 am: d27738c9 -s ours
am: 9934c7d7

Change-Id: Iffb1a5258af5414410c191549f61586bac5e20c5

ccf25186

DO NOT MERGE Fix divide by zero am: am: -s ours am:... · c5c549f4

Marco Nelissen authored 8 years ago

DO NOT MERGE Fix divide by zero am: bc08b17c am: 7525a44f -s ours am: 9c6eda24 am: 9872d49f am: 9195b00e am: ae5c6c5a -s ours
am: a303b610

Change-Id: Id564bef89473d0b7e4bf9946708aaf775ddad7b1

c5c549f4

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: am:... · 9934c7d7

Marco Nelissen authored 8 years ago

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a am: 4c31eb26 -s ours am: db358e20 am: d03ad914 am: 92106db5
am: d27738c9 -s ours

Change-Id: I0ed92a012791cbc694eb99350149b40cc7d32564

9934c7d7

DO NOT MERGE Fix divide by zero am: am: -s ours am:... · a303b610

Marco Nelissen authored 8 years ago

DO NOT MERGE Fix divide by zero am: bc08b17c am: 7525a44f  -s ours am: 9c6eda24 am: 9872d49f am: 9195b00e
am: ae5c6c5a  -s ours

Change-Id: I3f12f360f763f0945764a5ad2914d6420a39940f

a303b610

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: am:... · d27738c9

Marco Nelissen authored 8 years ago

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a am: 4c31eb26  -s ours am: db358e20 am: d03ad914
am: 92106db5

Change-Id: I2d9d85ba698375e82e53f2e5fe3373ad02546f99

d27738c9

DO NOT MERGE Fix divide by zero am: am: -s ours am:... · ae5c6c5a

Marco Nelissen authored 8 years ago

DO NOT MERGE Fix divide by zero am: bc08b17c am: 7525a44f  -s ours am: 9c6eda24 am: 9872d49f
am: 9195b00e

Change-Id: I454fdc260334d4921ca69d603c6e897cc02cb1df

ae5c6c5a

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: am:... · 92106db5

Marco Nelissen authored 8 years ago

Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a am: 4c31eb26  -s ours am: db358e20
am: d03ad914

Change-Id: I1df57cb96be8296a423e0f9c3de148ff23fdd469

92106db5

DO NOT MERGE Fix divide by zero am: bc08b17c am: 7525a44f -s ours am: 9c6eda24 · 9195b00e
Marco Nelissen authored 8 years ago
```
am: 9872d49f

Change-Id: I41ea228fb940bde4977f2e519920dc51e834d664
```
9195b00e
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a am: 4c31eb26 -s ours · d03ad914
Marco Nelissen authored 8 years ago
```
am: db358e20

Change-Id: I69d377350a4ec37bf910b4676553dff504524e65
```
d03ad914
DO NOT MERGE Fix divide by zero am: bc08b17c am: 7525a44f -s ours · 9872d49f
Marco Nelissen authored 8 years ago
```
am: 9c6eda24

Change-Id: I85cbe982109b75eaec1e1a17ba7868a4ffeb8aa6
```
9872d49f
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a · db358e20
Marco Nelissen authored 8 years ago
```
am: 4c31eb26  -s ours

Change-Id: Ibc0f32ba1c4701f8c30f82b5b6c281ded3c628c7
```
db358e20
DO NOT MERGE Fix divide by zero am: bc08b17c · 9c6eda24
Marco Nelissen authored 8 years ago
```
am: 7525a44f  -s ours

Change-Id: I52724e5697ec42b4ad1f0b2c2550408cd19b5143
```
9c6eda24
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev · 4c31eb26
Marco Nelissen authored 8 years ago
```
am: b6cf6d6a

Change-Id: Iabf62a27be889aad1ca4587c874571c2740914dd
```
4c31eb26
DO NOT MERGE Fix divide by zero · 7525a44f
Marco Nelissen authored 8 years ago
```
am: bc08b17c

Change-Id: I47cdf22bd60fd62ffcf5118c5c846c409eca960a
```
7525a44f
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev · b6cf6d6a
Marco Nelissen authored 8 years ago

b6cf6d6a

14 Oct, 2016 21 commits

Merge "Fix divide by zero" into lmp-dev am: am: am:... · 1e532567

Marco Nelissen authored 8 years ago

Merge "Fix divide by zero" into lmp-dev am: ef6934cd am: cd195030 am: 79a5c703 am: d0663173 am: 5282b305 am: 46b23388 am: ecd361b1 am: bd52a5c4
am: 43777584

Change-Id: Ib80f47bbd0ed9f1a2e4307c600836b64e7f8d522

1e532567

Fix divide by zero am: -s ours am: am: am:... · 4caa21fb

Marco Nelissen authored 8 years ago

Fix divide by zero am: 12416c41 -s ours am: e1fff04c am: fee873d9 am: 45c32466 am: 9f52131d am: 4d0520e1 am: 6b86204e am: 364df512
am: 263c57aa

Change-Id: I8fa7a86fa231404525407e05f8f3ecb8242ed95a

4caa21fb

Merge "Fix divide by zero" into lmp-dev am: am: am:... · 43777584

Marco Nelissen authored 8 years ago

Merge "Fix divide by zero" into lmp-dev am: ef6934cd am: cd195030 am: 79a5c703 am: d0663173 am: 5282b305 am: 46b23388 am: ecd361b1
am: bd52a5c4

Change-Id: I2555fb5203f776a7a73efb30a93e600993dcf189

43777584

Fix divide by zero am: -s ours am: am: am:... · 263c57aa

Marco Nelissen authored 8 years ago

Fix divide by zero am: 12416c41  -s ours am: e1fff04c am: fee873d9 am: 45c32466 am: 9f52131d am: 4d0520e1 am: 6b86204e
am: 364df512

Change-Id: Ife1c54150b265a766d57a382da3b1aa1136e03e0

263c57aa

Merge "Fix divide by zero" into lmp-dev am: am: am:... · bd52a5c4

Marco Nelissen authored 8 years ago

Merge "Fix divide by zero" into lmp-dev am: ef6934cd am: cd195030 am: 79a5c703 am: d0663173 am: 5282b305 am: 46b23388
am: ecd361b1

Change-Id: I62a0a06ea2722f4b149df04c65bae2a0dd9fd71f

bd52a5c4

Fix divide by zero am: -s ours am: am: am:... · 364df512

Marco Nelissen authored 8 years ago

Fix divide by zero am: 12416c41  -s ours am: e1fff04c am: fee873d9 am: 45c32466 am: 9f52131d am: 4d0520e1
am: 6b86204e

Change-Id: I8843c1ebfd700855944b66c0917e2bf80df921d5

364df512

Merge "Fix divide by zero" into lmp-dev am: am: am:... · ecd361b1

Marco Nelissen authored 8 years ago

Merge "Fix divide by zero" into lmp-dev am: ef6934cd am: cd195030 am: 79a5c703 am: d0663173 am: 5282b305
am: 46b23388

Change-Id: I83bb32beff76f9f1711c49d13798156ae0ef8ed9

ecd361b1

Fix divide by zero am: -s ours am: am: am:... · 6b86204e

Marco Nelissen authored 8 years ago

Fix divide by zero am: 12416c41  -s ours am: e1fff04c am: fee873d9 am: 45c32466 am: 9f52131d
am: 4d0520e1

Change-Id: I81b283218c48a83bdb5dba43ddc612b51f85a2b8

6b86204e

Merge "Fix divide by zero" into lmp-dev am: ef6934cd am: cd195030 am: 79a5c703 am: d0663173 · 46b23388
Marco Nelissen authored 8 years ago
```
am: 5282b305

Change-Id: I8d2974c4db3875cbfe790950bccdc1d2eeef21be
```
46b23388
Fix divide by zero am: 12416c41 -s ours am: e1fff04c am: fee873d9 am: 45c32466 · 4d0520e1
Marco Nelissen authored 8 years ago
```
am: 9f52131d

Change-Id: I42569842434d01c89d25f42def198ea2842fa5d3
```
4d0520e1
Merge "Fix divide by zero" into lmp-dev am: ef6934cd am: cd195030 am: 79a5c703 · 5282b305
Marco Nelissen authored 8 years ago
```
am: d0663173

Change-Id: I403238ef299fae85216a190035fd4335451560af
```
5282b305
Fix divide by zero am: 12416c41 -s ours am: e1fff04c am: fee873d9 · 9f52131d
Marco Nelissen authored 8 years ago
```
am: 45c32466

Change-Id: Id452573484ab3a0fc29b38282c5d06678ce07e66
```
9f52131d
Merge "Fix divide by zero" into lmp-dev am: ef6934cd am: cd195030 · d0663173
Marco Nelissen authored 8 years ago
```
am: 79a5c703

Change-Id: I469e756acfb69299e2ade43d3123cdb3e9872a0d
```
d0663173
Fix divide by zero am: 12416c41 -s ours am: e1fff04c · 45c32466
Marco Nelissen authored 8 years ago
```
am: fee873d9

Change-Id: I2209f54ecafbb7a514c83407ecef52e87721429d
```
45c32466
Merge "Fix divide by zero" into lmp-dev am: ef6934cd · 79a5c703
Marco Nelissen authored 8 years ago
```
am: cd195030

Change-Id: I299c0895349b4aa9439814d5040dceb3e2485ee8
```
79a5c703
Fix divide by zero am: 12416c41 -s ours · fee873d9
Marco Nelissen authored 8 years ago
```
am: e1fff04c

Change-Id: I6f5a0824341993c97d0cefc5e43e6b3e26c9b9ab
```
fee873d9

DO NOT MERGE Fix divide by zero · bc08b17c

Marco Nelissen authored 8 years ago

and be stricter about the layout of various boxes in mp4 files.

Bug: 31318219
Change-Id: I935bf2a6f29c5c7990acbb0cc8386f40144b14fc

bc08b17c

Merge "Fix divide by zero" into lmp-dev · cd195030
Marco Nelissen authored 8 years ago
```
am: ef6934cd

Change-Id: I7e4de9437a7ba41e239a1906e58465cf312a6539
```
cd195030

Fix divide by zero · e1fff04c

Marco Nelissen authored 8 years ago

am: 12416c41  -s ours

Change-Id: Iaa88e621286dbe41deddd2e2fa62b30bfbdfaa21

e1fff04c

Merge "Fix divide by zero" into lmp-dev · ef6934cd
Marco Nelissen authored 8 years ago

ef6934cd
Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev · 0afc0f8f
Robert Shih authored 8 years ago

0afc0f8f

13 Oct, 2016 2 commits

Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: am:... · 00082e26

Marco Nelissen authored 8 years ago

Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b1 am: a5477b11 am: 913b7564 -s ours am: 391b2806 -s ours am: 172fa079 am: 8f8e7191 -s ours am: 2f6c5b05 am: 29da5c2e am: 28255127 am: 5a4695b5 -s ours am: 45a89389
am: 953b6b19

Change-Id: I7f24e3f01d2405cfa4178bfd91afa06068a5c6f1

00082e26

DO NOT MERGE Fix divide by zero am: am: am: ... · 1f0726d0

Marco Nelissen authored 8 years ago

DO NOT MERGE Fix divide by zero am: febbd52c am: 55ce7e5d am: 1b3f61ce -s ours am: 76bc4166 -s ours am: 60996400 am: 93590752 -s ours am: a49626e9 am: ade3086e am: eb3c705d am: 92592432 -s ours am: b4f02ca0
am: 8ddc89db

Change-Id: If8a9fdeb89ff38a09be6c37be516440270f317e4

1f0726d0