fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
447 Commits 10 Branches 11 Tags 11 MiB
Commit Graph

447 Commits

Author SHA1 Message Date
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
android-build-team Robot 58bb6a7b0e Snap for 4579913 from 5c37b577ee to pi-release 
Change-Id: Iddd2f4c623cd958a2e239c22f23196e2407691ac
 2018-02-01 08:52: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
Android Build Merger (Role) 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 
Change-Id: I528d8dccae1e59c965dc4fcfae65ace1181886c6
 2018-01-31 19:48:39 +00:00
Android Build Merger (Role) 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 
Change-Id: I22ec8d38c1303f98be7f21e6ecce3bcb42ee7e61
 2018-01-31 19:48:37 +00:00
Android Build Merger (Role) 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 
Change-Id: I7899630b98b1a7a1c8de7559aaaf9bc44a250c66
 2018-01-31 19:48:36 +00:00
Android Build Merger (Role) 14728790d3 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 
Change-Id: Ie400d21f7fefabed6c91b4b04880bd80e6153b20
 2018-01-31 19:48:35 +00:00
Android Build Merger (Role) b2d0afac05 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 
Change-Id: I14943f95747e93f1e85cf560fe63fa11b168c9e3
 2018-01-31 19:48:34 +00:00
Android Build Merger (Role) 4523eae489 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 
Change-Id: I41f5e9a24af3c7a979c628df1be114185e02a8f7
 2018-01-31 19:48:33 +00:00
Android Build Merger (Role) 6dd431c768 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 
Change-Id: I9d3b87e62af0f54c01ced2e3aac41fa8e96cb056
 2018-01-31 19:48:31 +00:00
Android Build Merger (Role) adc8026945 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e 
Change-Id: If7874381cdfce6cced128082b35cbd6ab21f709d
 2018-01-31 19:48:30 +00:00
android-build-team Robot 626d5345e2 Snap for 4545621 from 82e17d87f0 to pi-release 
Change-Id: Ia2910df2b1395c73d6a693199ae38aea499630a7
 2018-01-14 08:44:34 +00:00
Jean-Michel Trivi 772c7f5542 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-01-13 01:30:08 +00:00
Jean-Michel Trivi 8415da3381 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-01-13 01:29:19 +00:00
Jean-Michel Trivi 4a54666f3e 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-01-13 00:53:27 +00:00
Jean-Michel Trivi 82e17d87f0 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-01-12 10:08:32 -08:00
android-build-team Robot 38167553d6 Snap for 4496165 from 2045658771 to pi-release 
Change-Id: I93144804d393601719fcc7b3e2c3fc647942a89f
 2017-12-11 12:11:19 +00:00
Xin Li 2045658771 Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: a3e0aa5f25 -s ours am: b9fc83e0e9 
am: 9864473fde  -s ours

Change-Id: I4b949aca22cc3af4afae998a4d1845d113dd62a2
 2017-12-08 01:18:01 +00:00
Stephen Li 97ff123fac Manually merge changes from giant AOSP topic 
Change-Id: I758f8cd61341d5dfb394245fb38bb9a6332fdc91
 2017-12-07 23:52:54 +00:00
Xin Li 9864473fde Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: a3e0aa5f25 -s ours 
am: b9fc83e0e9

Change-Id: I62a6e9ad1994e416489ca103a972796c24e1418f
 2017-12-07 09:05:16 +00:00
Xin Li b9fc83e0e9 Merge "DO NOT MERGE: Merge Oreo MR1 into master" 
am: a3e0aa5f25  -s ours

Change-Id: Ic4b4c468787b5a680e40d8bd915865cc4571ad92
 2017-12-07 07:36:49 +00:00