summaryrefslogtreecommitdiffstats
path: root/media/libavextensions/media/AVMediaExtensions.h
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-11-04 13:56:04 -0800
committerSteve Kondik <steve@cyngn.com>2015-11-04 13:56:04 -0800
commit6bc1c721cab472b5e270b61c8f106d8f17fcecdc (patch)
tree3784861eb415ccd67ed1935c04180f44398e668d /media/libavextensions/media/AVMediaExtensions.h
parentf032c781e72f10bad56cc625152e6dffc87dd0a7 (diff)
parentce9e446bd8c72972af86917563225e618b49d451 (diff)
downloadframeworks_av-6bc1c721cab472b5e270b61c8f106d8f17fcecdc.zip
frameworks_av-6bc1c721cab472b5e270b61c8f106d8f17fcecdc.tar.gz
frameworks_av-6bc1c721cab472b5e270b61c8f106d8f17fcecdc.tar.bz2
Merge branch 'LA.BF64.1.2.2_rb4.6' of git://codeaurora.org/platform/frameworks/av into cm-13.0
Change-Id: Iec8118b9a24fafe47e4006fca8a8e993bacb5ba8
Diffstat (limited to 'media/libavextensions/media/AVMediaExtensions.h')
-rw-r--r--media/libavextensions/media/AVMediaExtensions.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libavextensions/media/AVMediaExtensions.h b/media/libavextensions/media/AVMediaExtensions.h
index 6cf39f2..ae26143 100644
--- a/media/libavextensions/media/AVMediaExtensions.h
+++ b/media/libavextensions/media/AVMediaExtensions.h
@@ -47,12 +47,12 @@ struct AVMediaUtils {
return false;
}
virtual status_t AudioTrackGetPosition(AudioTrack* /*track*/,
- uint32_t* /*position*/) {
+ uint32_t* /*position*/) {
return NO_INIT;
}
virtual status_t AudioTrackGetTimestamp(AudioTrack* /*track*/,
- AudioTimestamp /*timestamp*/) {
+ AudioTimestamp* /*timestamp*/) {
return NO_INIT;
}