diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-12-30 08:18:15 -0800 | 
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-12-30 08:18:15 -0800 | 
| commit | b187de1ada34a9023c05d020a4592686ba761278 (patch) | |
| tree | 31dea84d078f6198ce17ca856fcbb76c402f37b6 /include/ndk | |
| parent | 64cbdee08a18b25448a5fb0b058d3b83d5630d7f (diff) | |
| download | frameworks_av-b187de1ada34a9023c05d020a4592686ba761278.zip frameworks_av-b187de1ada34a9023c05d020a4592686ba761278.tar.gz frameworks_av-b187de1ada34a9023c05d020a4592686ba761278.tar.bz2  | |
Line length 100
Change-Id: I6c8fe626a3825fa9e139319656d682a57b887c97
Diffstat (limited to 'include/ndk')
| -rw-r--r-- | include/ndk/NdkMediaCodec.h | 3 | ||||
| -rw-r--r-- | include/ndk/NdkMediaExtractor.h | 6 | 
2 files changed, 6 insertions, 3 deletions
diff --git a/include/ndk/NdkMediaCodec.h b/include/ndk/NdkMediaCodec.h index c07f4c9..4f6a1ef 100644 --- a/include/ndk/NdkMediaCodec.h +++ b/include/ndk/NdkMediaCodec.h @@ -142,7 +142,8 @@ media_status_t AMediaCodec_queueSecureInputBuffer(AMediaCodec*,  /**   * Get the index of the next available buffer of processed data.   */ -ssize_t AMediaCodec_dequeueOutputBuffer(AMediaCodec*, AMediaCodecBufferInfo *info, int64_t timeoutUs); +ssize_t AMediaCodec_dequeueOutputBuffer(AMediaCodec*, AMediaCodecBufferInfo *info, +        int64_t timeoutUs);  AMediaFormat* AMediaCodec_getOutputFormat(AMediaCodec*);  /** diff --git a/include/ndk/NdkMediaExtractor.h b/include/ndk/NdkMediaExtractor.h index 7a4e702..7324d31 100644 --- a/include/ndk/NdkMediaExtractor.h +++ b/include/ndk/NdkMediaExtractor.h @@ -55,12 +55,14 @@ media_status_t AMediaExtractor_delete(AMediaExtractor*);  /**   *  Set the file descriptor from which the extractor will read.   */ -media_status_t AMediaExtractor_setDataSourceFd(AMediaExtractor*, int fd, off64_t offset, off64_t length); +media_status_t AMediaExtractor_setDataSourceFd(AMediaExtractor*, int fd, off64_t offset, +        off64_t length);  /**   * Set the URI from which the extractor will read.   */ -media_status_t AMediaExtractor_setDataSource(AMediaExtractor*, const char *location); // TODO support headers +media_status_t AMediaExtractor_setDataSource(AMediaExtractor*, const char *location); +        // TODO support headers  /**   * Return the number of tracks in the previously specified media file  | 
