diff options
author | James Dong <jdong@google.com> | 2012-02-08 10:42:35 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-08 10:42:35 -0800 |
commit | 7ae4a2c130ec2cb5dec69d095b810698acc543b3 (patch) | |
tree | 40ab500ed6b99d4662be5abee1a8fe98f2d58902 /include/media | |
parent | 98ec94c5854daccc3474758524e7f4adfe535ce0 (diff) | |
parent | 000e18370baae60ffd9f25b509501dd8c26deabf (diff) | |
download | frameworks_av-7ae4a2c130ec2cb5dec69d095b810698acc543b3.zip frameworks_av-7ae4a2c130ec2cb5dec69d095b810698acc543b3.tar.gz frameworks_av-7ae4a2c130ec2cb5dec69d095b810698acc543b3.tar.bz2 |
Merge "Enable B frame support in MPEG4Writer"
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/stagefright/OMXCodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 4c30e04..e541c18 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -335,7 +335,7 @@ private: status_t applyRotation(); status_t waitForBufferFilled_l(); - int64_t retrieveDecodingTimeUs(bool isCodecSpecific); + int64_t getDecodingTimeUs(); status_t parseAVCCodecSpecificData( const void *data, size_t size, |