ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
41,907 Commits 2 Branches 0 Tags 54 MiB
84c7c01ea7
Commit Graph

41907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
84c7c01ea7 am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'd7fa7deef9bc0cf22bf450fdb062327697c087c4':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:30:39 -08:00
Jean-Baptiste Queru
c28371d138 Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 2012-02-28 07:28:52 -08:00
Jean-Baptiste Queru
5316ab3c34 am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit 'f881fa517978adc7ea610a1982e0d071f1fd3425':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-27 16:57:06 -08:00
Jean-Baptiste Queru
5d46260664 Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 2012-02-27 16:23:19 -08:00
Jean-Baptiste Queru
6a22ed0a4b am 93df415c: Merge "Add stubs for better compatibility" 
* commit '93df415c1e0b4c99f274adb3629ce19abf1d0f53':
  Add stubs for better compatibility
 2012-02-27 15:58:50 -08:00
Jean-Baptiste Queru
47e81bd44d Merge "Add stubs for better compatibility" 2012-02-27 15:36:22 -08:00
Jean-Baptiste Queru
3dd0b85008 am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 
* commit '9e3d957599c76ba19e23fd25b75ccc02d54efe3e':
  stagefright aacenc: Add prototypes for arm specific implementations of functions
 2012-02-27 13:07:43 -08:00
Jean-Baptiste Queru
c4d226afb1 am 354ac772: Merge "stagefright amrwb: Make local const arrays static" 
* commit '354ac772eca0afea25dd12d233e5cdee9677888b':
  stagefright amrwb: Make local const arrays static
 2012-02-27 13:07:40 -08:00
Jean-Baptiste Queru
4684d4b4d8 am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 
* commit '695cfe1e1e189f176fdf994f72d05a0129a66394':
  stagefright amrwb: Change a C++ style cast into a C style cast
 2012-02-27 13:07:36 -08:00
Jean-Baptiste Queru
cc1e3f6e44 am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 
* commit 'f7f1280e0c71d64098efb42b58a922d056164b5e':
  stagefright amrnb: Remove extern from table definitions
  stagefright amrnb: Add includes for prototype declarations of tables
  stagefright amrnb: Add missing const qualifier to table declarations in headers
 2012-02-27 13:07:33 -08:00
Jean-Baptiste Queru
4bbb0664c0 am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" 
* commit '1a864db7723a7947b72d24e6008ba48341d0feff':
  stagefright aacenc: Simplify the definition of __inline
 2012-02-27 13:07:30 -08:00
Jean-Baptiste Queru
1da7c45902 am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" 
* commit '77576ff487e227092cdaf09db163e21f1e07604a':
  stagefright amrwbenc: Remove a useless check
 2012-02-27 13:07:26 -08:00
Jean-Baptiste Queru
313019d1ad 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
Jean-Baptiste Queru
1a9265d7fd 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
Jean-Baptiste Queru
2f6ac77fe0 am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" 
* commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304':
  stagefright amrwbenc: Change keyword ordering
 2012-02-27 13:07:16 -08:00
Jean-Baptiste Queru
f2b5df8a52 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
Jean-Baptiste Queru
ccfe22f83d Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 2012-02-27 12:14:41 -08:00
Jean-Baptiste Queru
64485b7fc7 Merge "stagefright amrwb: Make local const arrays static" 2012-02-27 12:14:02 -08:00
Jean-Baptiste Queru
6a28648990 Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 2012-02-27 12:13:27 -08:00
Jean-Baptiste Queru
c8ebd8e9a8 Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 
* changes:
  stagefright amrnb: Remove extern from table definitions
  stagefright amrnb: Add includes for prototype declarations of tables
  stagefright amrnb: Add missing const qualifier to table declarations in headers
 2012-02-27 11:16:23 -08:00
Jean-Baptiste Queru
0470e9d4d1 Merge "stagefright aacenc: Simplify the definition of __inline" 2012-02-27 11:11:57 -08:00
Jean-Baptiste Queru
c95d442ac5 Merge "stagefright amrwbenc: Remove a useless check" 2012-02-27 11:11:18 -08:00
Jean-Baptiste Queru
3e9a9416df Merge "stagefright aacenc: Remove a stray semicolon" 2012-02-27 11:09:59 -08:00
Jean-Baptiste Queru
8f420aeefc Merge "stagefright amrwb: Make a global const array static" 2012-02-27 11:08:09 -08:00
Jean-Baptiste Queru
d98681e6cc Merge "stagefright amrwbenc: Change keyword ordering" 2012-02-27 11:06:25 -08:00
Jean-Baptiste Queru
98fc51d885 Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer" 2012-02-27 10:58:51 -08:00
Jean-Baptiste Queru
1f7cd76f0a Add stubs for better compatibility 
Change-Id: I3fafee637f3ab239e3b870c73bcfe34cf73caf4c
 2012-02-27 08:54:57 -08:00
The Android Open Source Project
bb4bcfc028 Reconcile with ics-mr1-release 
Change-Id: I496b3ff789ad7d4cb5f3cf720fbcab423a3694f6
 2012-02-24 13:57:46 -08:00
Jean-Baptiste Queru
f50a9dc7bb am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 
* commit '26d9944e3f75123708ef0cfb158f48709348a361':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
 2012-02-24 11:05:15 -08:00
Jean-Baptiste Queru
8ebb94eb7e 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
Jean-Baptiste Queru
0827014e5a am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" 
* commit '2accfc110a71add56f5e4c35228e88dfa3024676':
  stagefright aacenc: Fix an inline asm constraint
 2012-02-24 10:29:45 -08:00
Jean-Baptiste Queru
9f32cdb3ae Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 2012-02-24 10:28:01 -08:00
Jean-Baptiste Queru
332c28848f am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74 
* commit 'c4aa19a578b8a11bea225994c58116b407e63a69':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:27:06 -08:00
Jean-Baptiste Queru
c89356e2f2 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
Jean-Baptiste Queru
a7ea406dc9 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
Jean-Baptiste Queru
3815cf38ad Merge "stagefright aacenc: Fix an inline asm constraint" 2012-02-24 10:22:34 -08:00
Jean-Baptiste Queru
3f10c2513e 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
Jean-Baptiste Queru
f5442ba965 am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" 
* commit '5f83b95705fa84b87b498d67f3b1b8dc34038474':
  stagefright aacenc: Zero-initialize a struct
 2012-02-24 09:57:51 -08:00
Jean-Baptiste Queru
107e2c7b64 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
Jean-Baptiste Queru
3b76648057 am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 
* commit 'e7650c327980f15c6cd53ad0081a54d78c3248f0':
  stagefright aacenc: Avoid warnings about incompatible pointer types
 2012-02-24 09:48:14 -08:00
Jean-Baptiste Queru
b36440d1d5 Merge "stagefright aacenc: Zero-initialize a struct" 2012-02-24 09:47:23 -08:00
Jean-Baptiste Queru
b445a23c74 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
Jean-Baptiste Queru
8d9d3f917e am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" 
* commit '7ffa4546de0b9e22b4896731cdfd1655f61a0b6c':
  stagefright aacenc: Add const declarations to some pointers
 2012-02-24 09:23:23 -08:00
Jean-Baptiste Queru
be444488fc 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
Jean-Baptiste Queru
69ce038818 Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 2012-02-24 09:20:37 -08:00
Jean-Baptiste Queru
39ad1a1f6f am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm" 
* commit 'aa86aa60dc5d89caf7d7edc545bc96fa133d64e8':
  stagefright aacenc: Fix inline asm
 2012-02-24 08:53:30 -08:00
Jean-Baptiste Queru
adae87846c Merge "stagefright aacenc: Add const declarations to some pointers" 2012-02-24 08:53:25 -08:00
Jean-Baptiste Queru
e5cd6d2404 am 1b704610: Merge "stagefright aacenc: Fix inline asm" 
* commit '1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
  stagefright aacenc: Fix inline asm
 2012-02-24 08:50:32 -08:00
Jean-Baptiste Queru
026b1b26e5 Merge "stagefright aacenc: Fix inline asm" 2012-02-24 08:38:23 -08:00
Jean-Baptiste Queru
615c616f34 am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" 
* commit 'd7ab4e0c42a34331620c63c8c58d0dabc658eb1a':
  stagefright aacenc: Fix inline asm constraints
 2012-02-24 07:55:59 -08:00