fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-04 01:37:50 +01:00
Code Issues Projects Releases Wiki Activity
360 Commits 10 Branches 11 Tags 9.6 MiB
Commit Graph

360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
d8828f3450 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671 am: f1a2354a3a am: d6b29883ff 
am: 1ce9a79b52  -s ours

Change-Id: I1ef94896496b3ebe14a7befed9d80de95de636aa
 2018-02-02 14:55:49 +00:00
Android Build Merger (Role)
315bfca5c1 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 am: bae005cba3 am: b81d554ba6 am: fa62928801 
am: 53daa4e90c  -s ours

Change-Id: I216f295d4fc0ef52f763e1fd8b93da2080c8f572
 2018-02-02 14:55:41 +00:00
Android Build Merger (Role)
3be49fd8fe [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c am: bb38f901b4 am: e12ed0c4fb am: 27e0af2ad1 
am: 9ab6f29ae0  -s ours

Change-Id: I79afffd974b455d192aa1259514ac8c0d8f48202
 2018-02-02 14:55:34 +00:00
Jean-Michel Trivi
9f487b9566 Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev am: 378e6c244a am: 991036b9f8 am: 78b29903f9 
am: a6034001a4

Change-Id: I7902e224bb04f044c52323c55054503d15069610
 2018-02-02 14:55:25 +00:00
Android Build Merger (Role)
1ce9a79b52 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671 am: f1a2354a3a 
am: d6b29883ff

Change-Id: I1432c9e013fae8ec830ea44d094d63174dde4785
 2018-02-02 06:59:12 +00:00
Android Build Merger (Role)
53daa4e90c [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 am: bae005cba3 am: b81d554ba6 
am: fa62928801

Change-Id: Idc3d03203794c4307c0fcfdd20e052540eaa9a34
 2018-02-02 06:59:02 +00:00
Android Build Merger (Role)
9ab6f29ae0 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c am: bb38f901b4 am: e12ed0c4fb 
am: 27e0af2ad1

Change-Id: I9f2226babdca9c21003e743e920fe994483e3b40
 2018-02-02 06:58:49 +00:00
Jean-Michel Trivi
a6034001a4 Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev am: 378e6c244a am: 991036b9f8 
am: 78b29903f9

Change-Id: I264187a911014bbb8d0a4420ac4a25f4057f78dc
 2018-02-02 06:58:37 +00:00
Android Build Merger (Role)
d6b29883ff [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671 
am: f1a2354a3a

Change-Id: I744d3ea898571c5d58329b495f8fc1e9e9cfb730
 2018-02-02 03:41:44 +00:00
Android Build Merger (Role)
fa62928801 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 am: bae005cba3 
am: b81d554ba6

Change-Id: I580587d87c826a2abbc8284fcb787c1f5ce57e4b
 2018-02-02 03:41:20 +00:00
Android Build Merger (Role)
27e0af2ad1 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c am: bb38f901b4 
am: e12ed0c4fb

Change-Id: I0b14be2ff82aa5a67bd43398f96c1bc5699ca376
 2018-02-02 03:41:01 +00:00
Jean-Michel Trivi
78b29903f9 Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev am: 378e6c244a 
am: 991036b9f8

Change-Id: I7254dbe5cb685ea86b632dcbf670dea8a0671bf9
 2018-02-02 03:40:35 +00:00
Android Build Merger (Role)
f1a2354a3a [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b 
am: c54946e671

Change-Id: I888519abe97d8fa1cfdd754b0aa7f74d91b07c54
 2018-02-01 23:40:00 +00:00
Android Build Merger (Role)
b81d554ba6 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 
am: bae005cba3

Change-Id: Ib40b2afd08360c07103d756536b54e26adbf56d8
 2018-02-01 23:39:52 +00:00
Android Build Merger (Role)
e12ed0c4fb [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c 
am: bb38f901b4

Change-Id: I6faf7e4a0bbb8ed6a11cd77dbe749c8e6bf59ade
 2018-02-01 23:39:44 +00:00
Jean-Michel Trivi
991036b9f8 Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev 
am: 378e6c244a

Change-Id: I0cb3e214777a0ed27cd21e9008e379a5af0b5be7
 2018-02-01 23:39:34 +00:00
Android Build Merger (Role)
c54946e671 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b 
Change-Id: I0a7ee9e92621704af6bdc7294ce375e8462e9065
 2018-02-01 18:00:20 +00:00
Android Build Merger (Role)
c2fe4b944b [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 
Change-Id: Ia27f928400ceed95b6704b7b602968dbc14714e4
 2018-02-01 18:00:19 +00:00
Android Build Merger (Role)
243be669b3 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 
Change-Id: Ia94aa4643972ef0d09045546b4af093153772642
 2018-02-01 18:00:18 +00:00
Android Build Merger (Role)
658a02f977 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f 
Change-Id: Ice80a96b140e09ffe1ac65b36f4441e14a1b7950
 2018-02-01 18:00:17 +00:00
Android Build Merger (Role)
fce9663d6f [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe 
Change-Id: I6fe14a13927084b6c3e7386936b17e52dc308755
 2018-02-01 18:00:16 +00:00
Jean-Michel Trivi
31447431fe DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info 
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
 2018-02-01 18:00:13 +00:00
Android Build Merger (Role)
bae005cba3 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 
Change-Id: I2f20d89b7ef44751a99876ee0d6fb6fbb57df848
 2018-02-01 17:58:56 +00:00
Android Build Merger (Role)
2494f9fa12 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d 
Change-Id: I5997bd762037c34a710a8f208551f25ea792972c
 2018-02-01 17:58:55 +00:00
Android Build Merger (Role)
601d27b59d [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 
Change-Id: I2d04b1aaeb91d3e5d63659d30b07bf5831072da1
 2018-02-01 17:58:54 +00:00
Android Build Merger (Role)
0a9ef8a138 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 
Change-Id: Ia8958d29392426f83d946cb3050f738f5182db96
 2018-02-01 17:58:53 +00:00
Android Build Merger (Role)
5944cdf5b0 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f 
Change-Id: I8aa7bbac0c2910746f7de8f0949358ae56a4d7dc
 2018-02-01 17:58:51 +00:00
Android Build Merger (Role)
e78aa83b8f [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f 
Change-Id: I982f6f797485143c0a8379f1a904498fa3564e8c
 2018-02-01 17:58:50 +00:00
Android Build Merger (Role)
43323dd03f [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a 
Change-Id: If3b0d271ec214b0ec04f33639f9276d591665e36
 2018-02-01 17:58:49 +00:00
Android Build Merger (Role)
64b670e10a [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 
Change-Id: Id25465c6c5697a53b41ab5ceeb5a4ad68b6ddcb9
 2018-02-01 17:58:48 +00:00
Jean-Michel Trivi
dc880988f0 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info 
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
 2018-02-01 17:58:42 +00:00
Android Build Merger (Role)
bb38f901b4 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c 
Change-Id: I436c96743da8a703d0828ff33e955ea0e0ff3766
 2018-02-01 17:30:10 +00:00
Android Build Merger (Role)
233344c45c [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad 
Change-Id: I07f7c08f0864cb673c9c8ebc98a58d3a5414ee62
 2018-02-01 17:30:09 +00:00
Android Build Merger (Role)
464c4336ad [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 
Change-Id: I36f8ec554ac96cdef4669809c8923b4f8b56768b
 2018-02-01 17:30:08 +00:00
Android Build Merger (Role)
bd4b66c1a9 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c 
Change-Id: Ibed017aec202e84aade79f805866c7102bdffa03
 2018-02-01 17:30:07 +00:00
Android Build Merger (Role)
0bbb81398c [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 
Change-Id: I50bab67ba74e6892895a9ad7aae4dc221f03ad89
 2018-02-01 17:30:05 +00:00
Android Build Merger (Role)
46ead43c76 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d 
Change-Id: I06431e0b18182521b2decfac9a890b3f61cd5593
 2018-02-01 17:30:04 +00:00
Android Build Merger (Role)
81ea4ba91d [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 
Change-Id: I3ad03691188f287aaea76280aaafc2485fe66a75
 2018-02-01 17:30:03 +00:00
Android Build Merger (Role)
c48482d937 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 
Change-Id: I75bccc4690579a56ec343b735e94d54bbd780e92
 2018-02-01 17:30:02 +00:00
Android Build Merger (Role)
99f3e5ce05 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 
Change-Id: I6afb07170037b0e27738cbe7e53dc3d733fbd874
 2018-02-01 17:30:01 +00:00
Jean-Michel Trivi
08ae2e8d12 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info 
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
 2018-02-01 17:29:49 +00:00
Jean-Michel Trivi
378e6c244a Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev 
* changes:
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38 skipped: 490995c3c4
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e
  DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
 2018-02-01 17:27:43 +00:00
Jean-Michel Trivi
5c37b577ee DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 8415da3381 am: 8765ef76ef am: e9b6807818 
am: 78d566fc19  -s ours

Change-Id: Iebff381e12ca0f86c9cb22c856b4c7be3c3a5581
 2018-02-01 00:49:21 +00:00
Jean-Michel Trivi
78d566fc19 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 8415da3381 am: 8765ef76ef 
am: e9b6807818

Change-Id: If9c985a1886178b22407791196dee0f8dd8ceafe
 2018-01-31 23:05:00 +00:00
Jean-Michel Trivi
e9b6807818 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 8415da3381 
am: 8765ef76ef

Change-Id: Iec8df9cd119dc386d71f38fed7c91c980c596596
 2018-01-31 22:38:47 +00:00
Jean-Michel Trivi
8765ef76ef DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info 
am: 8415da3381

Change-Id: I376dd3bfb42dce66ea2de637277c341aa04a4b14
 2018-01-31 21:50:42 +00:00
Jean-Michel Trivi
d9d9c95b48 MPEG-4 AAC Decoder: check against invalid height info am: 772c7f5542 
am: b75592cd1a

Change-Id: I0c302d058a8a8a83a53a83a6456fa328d0d6ff91
 2018-01-31 21:41:35 +00:00
Jean-Michel Trivi
b75592cd1a MPEG-4 AAC Decoder: check against invalid height info 
am: 772c7f5542

Change-Id: Iba7581d349f0ac7cf6a1686347de5993ebaa0c10
 2018-01-31 21:29:55 +00:00
Android Build Merger (Role)
6cad71f03e [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38 skipped: 490995c3c4 
Change-Id: Ia2560855c28b283d7491e75de27944e4cd6d27f7
 2018-01-31 19:48:45 +00:00
Android Build Merger (Role)
490995c3c4 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38 
Change-Id: I54012703d606d0a5eb113ee109fc5ec87204bb6a
 2018-01-31 19:48:44 +00:00