Andreas Huber db85b54395 resolved conflicts for merge of 3d630e86 to master ...

Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e

2011-11-30 09:53:40 -08:00

..

nuplayer

resolved conflicts for merge of 3d630e86 to master

2011-11-30 09:53:40 -08:00

Android.mk

NuPlayer is now taking on the task of streaming over RTSP.

2011-10-13 11:31:06 -07:00

MediaPlayerService.cpp

resolved conflicts for merge of 26f70db9 to master

2011-11-08 10:40:20 -08:00

MediaPlayerService.h

Remove surface legacy APIs and code.

2011-10-28 09:39:23 -07:00

MediaRecorderClient.cpp

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

2011-10-26 09:57:54 +01:00

MediaRecorderClient.h

Do not support still image capture mode for timelapse video recording

2011-07-24 10:33:54 -07:00

MetadataRetrieverClient.cpp

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

2011-10-26 09:57:54 +01:00

MetadataRetrieverClient.h

…

MidiFile.cpp

MidiFile uses C++ Thread not createThreadEtc

2011-11-16 15:43:31 -08:00

MidiFile.h

MidiFile uses C++ Thread not createThreadEtc

2011-11-16 15:43:31 -08:00

MidiMetadataRetriever.cpp

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

2011-10-26 09:57:54 +01:00

MidiMetadataRetriever.h

…

StagefrightPlayer.cpp

resolved conflicts for merge of 26f70db9 to master

2011-11-08 10:40:20 -08:00

StagefrightPlayer.h

Remove surface legacy APIs and code.

2011-10-28 09:39:23 -07:00

StagefrightRecorder.cpp

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

2011-10-26 09:57:54 +01:00

StagefrightRecorder.h

Fix an issue where we should allow negative values but did not

2011-10-05 20:43:52 -07:00

TestPlayerStub.cpp

…

TestPlayerStub.h

Remove surface legacy APIs and code.

2011-10-28 09:39:23 -07:00