diff options
| author | Chong Zhang <chz@google.com> | 2014-07-12 02:47:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-11 16:34:41 +0000 |
| commit | e71dcef63a746970d5c11c83207201fe8de02a78 (patch) | |
| tree | 4267ac2a10922609f01fe613a06fed23ba6df009 /include | |
| parent | 388742df51084f02a362818a884f3bde71b7ef8d (diff) | |
| parent | 749dafad09d85f2aaf6902a7ff16b4087e3bc4c7 (diff) | |
| download | frameworks_av-e71dcef63a746970d5c11c83207201fe8de02a78.zip frameworks_av-e71dcef63a746970d5c11c83207201fe8de02a78.tar.gz frameworks_av-e71dcef63a746970d5c11c83207201fe8de02a78.tar.bz2 | |
Merge "MediaCodec: change onError cb to return CodecException"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 046496c..a0ff997 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -279,7 +279,7 @@ private: void onInputBufferAvailable(); void onOutputBufferAvailable(); - void onError(int32_t actionCode, status_t err); + void onError(status_t err, int32_t actionCode, const char *detail = NULL); void onOutputFormatChanged(); status_t onSetParameters(const sp<AMessage> ¶ms); |