summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2013-11-15 08:25:13 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-15 08:25:13 -0800
commit576e89b523d7705545032edc67d98d9ab1dedbd2 (patch)
tree114583cf06506be2698df0284d4b57c96e976df0 /libvideoeditor
parent0f1ecc2e2ff84144d5293f7f79ba895538d27f9b (diff)
parent7dae71d606ded1dbc2aa9733c3d98ffac57988f2 (diff)
downloadframeworks_av-576e89b523d7705545032edc67d98d9ab1dedbd2.zip
frameworks_av-576e89b523d7705545032edc67d98d9ab1dedbd2.tar.gz
frameworks_av-576e89b523d7705545032edc67d98d9ab1dedbd2.tar.bz2
am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-dev
* commit '7dae71d606ded1dbc2aa9733c3d98ffac57988f2': AwesomePlayer: correct stream type for offload
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-xlibvideoeditor/lvpp/VideoEditorPlayer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.h b/libvideoeditor/lvpp/VideoEditorPlayer.h
index ab6d731..5862c08 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.h
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.h
@@ -62,6 +62,7 @@ class VideoEditorPlayer : public MediaPlayerInterface {
virtual void pause();
virtual void close();
void setAudioStreamType(audio_stream_type_t streamType) { mStreamType = streamType; }
+ virtual audio_stream_type_t getAudioStreamType() const { return mStreamType; }
void setVolume(float left, float right);
virtual status_t dump(int fd,const Vector<String16>& args) const;