Andreas Huber b9354fdf72 am 13770dcc: am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread ...

Merge commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33'

* commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33':
  Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.

2010-09-23 14:25:28 -07:00

..

java/android

Merge "1. Added OverlayFrame constuctor 2. Invalidate transitions when trimming video 3. Remove image file when removing an OverlayFrame 4. Bug fixes in the VideoEditor implementation"

2010-09-23 13:48:33 -07:00

jni

resolved conflicts for merge of ac4a284a to master

2010-09-23 12:22:44 -07:00

libdrm

…

libeffects

am 6943b94b: am a6dc4699: Merge "Fix issue 2913071." into gingerbread

2010-09-21 16:53:20 -07:00

libmedia

am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread

2010-09-17 23:25:37 -07:00

libmediaplayerservice

Implemented frequent read returns for quick stop in time lapse.

2010-09-17 09:50:27 -07:00

libstagefright

am 13770dcc: am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread

2010-09-23 14:25:28 -07:00

mediaserver

…

mtp

MTP: Fix typo that resulted in the MTP provider returning thumb format for object format

2010-09-20 18:29:59 -04:00

tests

resolved conflicts for merge of ac4a284a to master

2010-09-23 12:22:44 -07:00