summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-04 09:30:49 -0800
committerGlenn Kasten <gkasten@google.com>2012-01-12 10:31:55 -0800
commit8dcbd11c186e26b67de813adaec66dd578415cd7 (patch)
treef7e1a89f6fa2ae4d5632d303fcdd54ef2d1c4671 /libvideoeditor
parentc0f8fbe3ded614201abac794c34669c8a9fdb696 (diff)
downloadframeworks_av-8dcbd11c186e26b67de813adaec66dd578415cd7.zip
frameworks_av-8dcbd11c186e26b67de813adaec66dd578415cd7.tar.gz
frameworks_av-8dcbd11c186e26b67de813adaec66dd578415cd7.tar.bz2
Use audio_format_t consistently
Change-Id: Idb08c49fe1a2c87ea2bb080815a5a6f95409834c
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-xlibvideoeditor/lvpp/VideoEditorPlayer.cpp2
-rwxr-xr-xlibvideoeditor/lvpp/VideoEditorPlayer.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.cpp b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
index d2ec681..a0219b6 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.cpp
@@ -379,7 +379,7 @@ status_t VideoEditorPlayer::VeAudioOutput::getPosition(uint32_t *position) {
}
status_t VideoEditorPlayer::VeAudioOutput::open(
- uint32_t sampleRate, int channelCount, int format, int bufferCount,
+ uint32_t sampleRate, int channelCount, audio_format_t format, int bufferCount,
AudioCallback cb, void *cookie) {
mCallback = cb;
diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.h b/libvideoeditor/lvpp/VideoEditorPlayer.h
index 6b10b36..684a2e6 100755
--- a/libvideoeditor/lvpp/VideoEditorPlayer.h
+++ b/libvideoeditor/lvpp/VideoEditorPlayer.h
@@ -50,7 +50,7 @@ class VideoEditorPlayer : public MediaPlayerInterface {
virtual status_t open(
uint32_t sampleRate, int channelCount,
- int format, int bufferCount,
+ audio_format_t format, int bufferCount,
AudioCallback cb, void *cookie);
virtual void start();