7c1615d0009a5e4583d273e4a24bd0b5be2c4f53 |
|
09-Dec-2015 |
Marco Nelissen <marcone@google.com> |
resolve merge conflicts of 85234a9133 to master. Change-Id: I6b1b51ac4f15f936e42fadd48deb32e205dfa163
|
5d5c3a132bb446ac78a37dfaac24a46cacf0dd73 |
|
09-Dec-2015 |
Marco Nelissen <marcone@google.com> |
Tabs -> spaces Change-Id: I706d7ef81a138739996e0fbb2759348c7a4be8a6
/frameworks/av/media/libstagefright/codecs/amrwbenc/src/preemph.c
|
13158e7c748c760d238fd5e965805d251fcf2776 |
|
08-Dec-2015 |
Marco Nelissen <marcone@google.com> |
Fix overflows in amrwbenc Revert 3cdaed88daeeebfe05e7913837f41c2d92f411cc and 883ff4f4c41ae9bf84d1912ab054fe38f7505dd0, and fix the overflows that should have been clamped instead of allowed to overflow. Bug: 25843966 Bug: 23752600 Change-Id: I9af1726d058eb8eeaa80fa8df74fe0a3759486c1
/frameworks/av/media/libstagefright/codecs/amrwbenc/src/preemph.c
|
d23f7ef608b3ef917a6f9b371feebc98b74ee485 |
|
08-Dec-2015 |
Marco Nelissen <marcone@google.com> |
Fix overflows in amrwbenc Revert 3cdaed88daeeebfe05e7913837f41c2d92f411cc and 883ff4f4c41ae9bf84d1912ab054fe38f7505dd0, and fix the overflows that should have been clamped instead of allowed to overflow. Bug: 25843966 Bug: 23752600 Change-Id: I9af1726d058eb8eeaa80fa8df74fe0a3759486c1
/frameworks/av/media/libstagefright/codecs/amrwbenc/src/preemph.c
|
bbe860d522c7ce46eff6de49dab2ff7e4059a3d8 |
|
08-Dec-2015 |
Marco Nelissen <marcone@google.com> |
Fix integer overflow in amrwbenc Bug: 25843966 Change-Id: Ib9b37712819d776496b7a06b9e85c5d1e43f9d25
/frameworks/av/media/libstagefright/codecs/amrwbenc/src/preemph.c
|
b676a05348e4c516fa8b57e33b10548e6142c3f8 |
|
05-Apr-2011 |
Mans Rullgard <mans@mansr.com> |
stagefright aacenc/amrwbenc: Remove trailing whitespace This was applied in AOSP master earlier, in commit b21611e5b0f1797e39e781d91ade023bac87637f, but when merged into the Google internal tree in 88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these changes have been brought in. (The diff of this merge commit and its first parent, d94b71d, is empty.) Therefore, reapply the rest of these changes on the files that still are present in the current version. Change-Id: I645a9b9134769958a11808a06163123d28d83e46
/frameworks/av/media/libstagefright/codecs/amrwbenc/src/preemph.c
|
e2e838afcf03e603a41a0455846eaf9614537c16 |
|
22-Apr-2011 |
Mans Rullgard <mans@mansr.com> |
Convert line breaks to Unix style Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
/frameworks/av/media/libstagefright/codecs/amrwbenc/src/preemph.c
|
956c553ab0ce72f8074ad0fda2ffd66a0305700c |
|
15-May-2010 |
James Dong <jdong@google.com> |
Initial software encoder checkins Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60
/frameworks/av/media/libstagefright/codecs/amrwbenc/src/preemph.c
|