diff options
| author | Lajos Molnar <lajos@google.com> | 2013-11-04 21:53:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-04 21:53:21 -0800 |
| commit | 2922d230155cb1be7acc0c11bef6f0ca0345bdb7 (patch) | |
| tree | 77f2b37c0e90ec5fc724149352d84c3a2d68ee88 /media/libstagefright/MediaCodec.cpp | |
| parent | 4cf799fbbb74de102d34ccb014ba7fbd9bfa5e14 (diff) | |
| parent | 065789f24890b0a9f3614dc175e6f7664af1f2ce (diff) | |
| download | frameworks_av-2922d230155cb1be7acc0c11bef6f0ca0345bdb7.zip frameworks_av-2922d230155cb1be7acc0c11bef6f0ca0345bdb7.tar.gz frameworks_av-2922d230155cb1be7acc0c11bef6f0ca0345bdb7.tar.bz2 | |
am 065789f2: Merge "Restore NuPlayer error and EOS handling" into klp-dev
* commit '065789f24890b0a9f3614dc175e6f7664af1f2ce':
Restore NuPlayer error and EOS handling
Diffstat (limited to 'media/libstagefright/MediaCodec.cpp')
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index e299caf..8af1aaf 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -1506,7 +1506,8 @@ void MediaCodec::returnBuffersToCodecOnPort(int32_t portIndex) { info->mOwnedByClient = false; if (portIndex == kPortIndexInput) { - msg->setInt32("err", ERROR_END_OF_STREAM); + /* no error, just returning buffers */ + msg->setInt32("err", OK); } msg->post(); } |