Kenny Root 4a90f93781 resolved conflicts for merge of a127c07c to master ...

Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086

2010-10-14 23:58:41 -07:00

..

Android.mk

Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.

2010-08-04 11:49:24 -07:00

MediaPlayerService.cpp

am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread

2010-10-10 16:06:04 -07:00

MediaPlayerService.h

am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread

2010-10-10 16:06:04 -07:00

MediaRecorderClient.cpp

Added setAuxiliaryOutputFile to MediaRecorder and JNI

2010-08-31 10:38:49 -07:00

MediaRecorderClient.h

Added setAuxiliaryOutputFile to MediaRecorder and JNI

2010-08-31 10:38:49 -07:00

MetadataRetrieverClient.cpp

…

MetadataRetrieverClient.h

…

MidiFile.cpp

…

MidiFile.h

Squashed commit of the following:

2010-08-23 12:30:24 -07:00

MidiMetadataRetriever.cpp

…

MidiMetadataRetriever.h

…

StagefrightPlayer.cpp

am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread

2010-10-10 17:14:53 -07:00

StagefrightPlayer.h

Squashed commit of the following:

2010-08-23 12:30:24 -07:00

StagefrightRecorder.cpp

resolved conflicts for merge of a127c07c to master

2010-10-14 23:58:41 -07:00

StagefrightRecorder.h

resolved conflicts for merge of a127c07c to master

2010-10-14 23:58:41 -07:00

TestPlayerStub.cpp

…

TestPlayerStub.h

Squashed commit of the following:

2010-08-23 12:30:24 -07:00