diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-27 05:48:30 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-27 05:48:30 -0800 |
| commit | 5a88501c8f677e34afb2043d7e81d8e09d6fa5f4 (patch) | |
| tree | 4569ce180afcbc2aa3afaa35b06581e585294b4e /media/libstagefright/OMXCodec.cpp | |
| parent | 61280541836947ce0b281b240ffa4c55bbf5bd55 (diff) | |
| parent | e5ba80c5c802ddad57e1132675c32b479c16758a (diff) | |
| download | frameworks_av-5a88501c8f677e34afb2043d7e81d8e09d6fa5f4.zip frameworks_av-5a88501c8f677e34afb2043d7e81d8e09d6fa5f4.tar.gz frameworks_av-5a88501c8f677e34afb2043d7e81d8e09d6fa5f4.tar.bz2 | |
resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aosp
Change-Id: Iea12c8a6cabf84584e4a89ad80e298c1f4ea3dd7
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 3731a4a..69f4989 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -451,7 +451,7 @@ status_t OMXCodec::parseAVCCodecSpecificData( // assertion, let's be lenient for now... // CHECK((ptr[4] >> 2) == 0x3f); // reserved - size_t lengthSize = 1 + (ptr[4] & 3); + size_t lengthSize __unused = 1 + (ptr[4] & 3); // commented out check below as H264_QVGA_500_NO_AUDIO.3gp // violates it... @@ -2006,7 +2006,6 @@ status_t OMXCodec::cancelBufferToNativeWindow(BufferInfo *info) { OMXCodec::BufferInfo* OMXCodec::dequeueBufferFromNativeWindow() { // Dequeue the next buffer from the native window. ANativeWindowBuffer* buf; - int fenceFd = -1; int err = native_window_dequeue_buffer_and_wait(mNativeWindow.get(), &buf); if (err != 0) { CODEC_LOGE("dequeueBuffer failed w/ error 0x%08x", err); @@ -2111,7 +2110,6 @@ status_t OMXCodec::pushBlankBuffersToNativeWindow() { // on the screen and then been replaced, so an previous video frames are // guaranteed NOT to be currently displayed. for (int i = 0; i < numBufs + 1; i++) { - int fenceFd = -1; err = native_window_dequeue_buffer_and_wait(mNativeWindow.get(), &anb); if (err != NO_ERROR) { ALOGE("error pushing blank frames: dequeueBuffer failed: %s (%d)", |