diff options
| author | Andreas Huber <andih@google.com> | 2011-11-22 08:39:11 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-22 08:39:11 -0800 |
| commit | e933cb5ae546d023ab756391a135c170874e7901 (patch) | |
| tree | 4a538f125f876469ea59e173b9d3645000c91cd4 /include | |
| parent | e8e5f86e9e310b065596c8cbbca1543eb833dee1 (diff) | |
| parent | 71b61a960ae30df990976ca5dbe780d85a15b0d1 (diff) | |
| download | frameworks_av-e933cb5ae546d023ab756391a135c170874e7901.zip frameworks_av-e933cb5ae546d023ab756391a135c170874e7901.tar.gz frameworks_av-e933cb5ae546d023ab756391a135c170874e7901.tar.bz2 | |
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index c21d19d..84f8282 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -336,6 +336,10 @@ private: int64_t retrieveDecodingTimeUs(bool isCodecSpecific); + status_t parseAVCCodecSpecificData( + const void *data, size_t size, + unsigned *profile, unsigned *level); + OMXCodec(const OMXCodec &); OMXCodec &operator=(const OMXCodec &); }; |