diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-26 22:02:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 22:02:28 +0000 |
| commit | e5ba80c5c802ddad57e1132675c32b479c16758a (patch) | |
| tree | 839461daae7b2e8b5dcb8acdf33a7367aa1a378c /media/libstagefright/OMXCodec.cpp | |
| parent | e464018a7fdacdc3bef3058620eb09ec60d3cccf (diff) | |
| parent | 1a9c3954a20800dda3d6d18048c7f0edc8c53e6a (diff) | |
| download | frameworks_av-e5ba80c5c802ddad57e1132675c32b479c16758a.zip frameworks_av-e5ba80c5c802ddad57e1132675c32b479c16758a.tar.gz frameworks_av-e5ba80c5c802ddad57e1132675c32b479c16758a.tar.bz2 | |
am 1a9c3954: Merge "Stagefright: Fix unused variables, functions, values"
* commit '1a9c3954a20800dda3d6d18048c7f0edc8c53e6a':
Stagefright: Fix unused variables, functions, values
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 d54f65d..9c03c9a 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -450,7 +450,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... @@ -2004,7 +2004,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); @@ -2109,7 +2108,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)", |