Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67cde67f authored by Dharmaray Kundargi's avatar Dharmaray Kundargi Committed by Android Git Automerger
Browse files

am 307003a8: Merge "integrate videoeditor preview player." into honeycomb 

* commit '307003a844c90458bcfd7398c44bbae734936238':
  integrate videoeditor preview player.
parents f9c1f51b ccb3506e

include/media/stagefright/AudioPlayer.h

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public: 
    bool reachedEOS(status_t *finalStatus);



private:

    friend class VideoEditorAudioPlayer;

    sp<MediaSource> mSource;

    AudioTrack *mAudioTrack;

media/libstagefright/include/AwesomePlayer.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ struct AwesomePlayer { 


private:

    friend struct AwesomeEvent;

    friend struct PreviewPlayer;



    enum {

        PLAYING             = 1,