32901b397b
am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
...
* commit 'be9a705586edafcedc9fabb94d3259f882b7cbd7':
stagefright aacenc: Remove a stray semicolon
2012-02-27 13:07:23 -08:00
716a051719
am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
...
* commit 'fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f':
stagefright amrwb: Make a global const array static
2012-02-27 13:07:20 -08:00
c1da1e1b2f
am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
...
* commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304':
stagefright amrwbenc: Change keyword ordering
2012-02-27 13:07:16 -08:00
6bc542e0f3
am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
...
* commit '5aff259c61e54e441ed04bf77e3cc69a0374432d':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
2012-02-27 13:07:12 -08:00
be9a705586
Merge "stagefright aacenc: Remove a stray semicolon"
2012-02-27 11:09:59 -08:00
fe5f5d7728
Merge "stagefright amrwb: Make a global const array static"
2012-02-27 11:08:09 -08:00
94ee1bf232
Merge "stagefright amrwbenc: Change keyword ordering"
2012-02-27 11:06:25 -08:00
5aff259c61
Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"
2012-02-27 10:58:51 -08:00
7a60831412
stagefright amrwb: Make a global const array static
...
This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C. Prior to this,
this table produced multiple definitions of the same symbol.
This was committed on the master branch of the opencore
repository in commit a803bd49a631317e0d52ff060cf1799f7741a47e,
based on AOSP contribution 10017.
Change-Id: Id76274964242b119ab61b8181e557477df1e1521
2012-02-24 23:04:24 +02:00
26d9944e3f
am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
...
* commit '6a300a5413898ff8b728e77c5a23290cae60e9b5':
stagefright aacenc: Make the bits to write in WriteBits unsigned
2012-02-24 11:02:29 -08:00
a9e1747f9e
stagefright aacenc: Remove a stray semicolon
...
This avoids warnings about an empty body in an if statement.
mem_free does the same null check, so the accidental extra
semicolon was harmless, and the whole if statement actually
is needless. But if removing the if statements, all the
other ones should be removed too, for consistency.
(This could be done as a separate change).
Change-Id: I1b6064dedd15ffa949043bb5396148aaed9b43f6
2012-02-24 21:01:26 +02:00
4a12db6d4e
stagefright amrwbenc: Change keyword ordering
...
This avoids warnings about 'static' not being at the beginning
of the declarations.
Change-Id: I80f91b8a0f7f61edcdca96c206fedbd74ec0d88e
2012-02-24 20:54:26 +02:00
6a300a5413
Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
2012-02-24 10:28:01 -08:00
2accfc110a
am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
...
* commit 'd6a25154d94c48ab2ef12641c789458ab14ca94f':
stagefright aacenc: Fix an inline asm constraint
2012-02-24 10:26:53 -08:00
c4aa19a578
am ea227787: Merge changes I903353c5,I822dcc74
...
* commit 'ea227787253e29da2d688399b097e05708d3bf73':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
2012-02-24 10:24:34 -08:00
d6a25154d9
Merge "stagefright aacenc: Fix an inline asm constraint"
2012-02-24 10:22:34 -08:00
ea22778725
Merge changes I903353c5,I822dcc74
...
* changes:
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
2012-02-24 10:07:49 -08:00
5f83b95705
am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
...
* commit 'bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
stagefright aacenc: Zero-initialize a struct
2012-02-24 09:54:58 -08:00
bf45bbf3b4
Merge "stagefright aacenc: Zero-initialize a struct"
2012-02-24 09:47:23 -08:00
e7650c3279
am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
...
* commit 'e5bdd24b69c4033163d478d721247691e11cea36':
stagefright aacenc: Avoid warnings about incompatible pointer types
2012-02-24 09:45:40 -08:00
7ffa4546de
am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
...
* commit '47b56c5a46287ea226c05e3c0238a91f4702491a':
stagefright aacenc: Add const declarations to some pointers
2012-02-24 09:20:44 -08:00
e5bdd24b69
Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
2012-02-24 09:20:37 -08:00
47b56c5a46
Merge "stagefright aacenc: Add const declarations to some pointers"
2012-02-24 08:53:25 -08:00
aa86aa60dc
am 1b704610: Merge "stagefright aacenc: Fix inline asm"
...
* commit '1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
stagefright aacenc: Fix inline asm
2012-02-24 08:50:32 -08:00
1b7046108c
Merge "stagefright aacenc: Fix inline asm"
2012-02-24 08:38:23 -08:00
d7ab4e0c42
am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
...
* commit 'bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
stagefright aacenc: Fix inline asm constraints
2012-02-24 07:53:43 -08:00
bf1e85bfc8
Merge "stagefright aacenc: Fix inline asm constraints"
2012-02-24 07:39:03 -08:00
79cfde69fd
am 52bfc243: docs: fix misc doc bugs from external issue tracker
...
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
2012-02-09 12:48:08 -08:00
52bfc24368
docs: fix misc doc bugs from external issue tracker
...
Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
2012-02-09 12:45:16 -08:00
832dc8f794
stagefright aacenc: Avoid warnings about incompatible pointer types
...
Change-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7
2012-01-30 12:59:03 +02:00
64085d03ef
am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
...
* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
stagefright aacenc: Fix type definitions for 64 bit platforms
2012-01-25 10:27:41 -08:00
12045502c4
Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
2012-01-25 09:17:46 -08:00
4cd2b34327
am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
...
* commit '98539a4eba7677c0b1ddc12f800c7075851ef302':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
2012-01-24 15:13:45 -08:00
fc2ea24b02
am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
...
* commit 'd80cbb8c7b13203704c00e2f5941588811c15665':
stagefright aacenc: Add missing newlines at the end of files
2012-01-24 15:13:42 -08:00
98539a4eba
Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
2012-01-24 14:26:32 -08:00
d80cbb8c7b
Merge "stagefright aacenc: Add missing newlines at the end of files"
2012-01-24 10:34:25 -08:00
2ae5805cf1
am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
...
* commit '164a984224f5d430757628028f2522329987350f':
stagefright aacenc: Properly terminate a comment
2012-01-24 08:40:50 -08:00
164a984224
Merge "stagefright aacenc: Properly terminate a comment"
2012-01-24 07:51:12 -08:00
c3c36b4fe5
am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
...
* commit '9d25b82d280c2d979d500e7da4447148f32f820b':
Rename LOG_ASSERT to ALOG_ASSERT
2012-01-19 17:26:16 -08:00
12b7da6995
am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
...
* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
2012-01-19 17:26:12 -08:00
f3f650db96
am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
...
* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
2012-01-19 17:26:08 -08:00
08d3c6e5ba
am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
...
* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
2012-01-19 17:26:03 -08:00
7ae84204c1
am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
...
* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
2012-01-19 17:25:58 -08:00
97aa8ee811
Merge ee4618bc
...
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
2012-01-19 17:18:25 -08:00
f68633da3c
Rename LOG_ASSERT to ALOG_ASSERT
...
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
2012-01-19 14:45:08 -08:00
c6aacce371
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
...
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
2012-01-19 14:45:03 -08:00
a51f0e707f
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
...
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
2012-01-19 14:44:59 -08:00
933e856150
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
...
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
2012-01-19 14:44:56 -08:00
1afd5bab4e
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
...
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
2012-01-19 14:44:50 -08:00
06ade6ae1b
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
...
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
2012-01-19 14:44:31 -08:00
