diff options
| author | Lajos Molnar <lajos@google.com> | 2013-11-01 23:17:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-01 23:17:47 +0000 |
| commit | 065789f24890b0a9f3614dc175e6f7664af1f2ce (patch) | |
| tree | 62a51e41008b374cdbc553153c5ee7c211f57138 /media/libstagefright/MediaCodec.cpp | |
| parent | 5c7ffaed6f04b844c2e4e2024bfb0203ac2233dd (diff) | |
| parent | 7fa015217e618265ff5a844cf6961ecc316c81a4 (diff) | |
| download | frameworks_av-065789f24890b0a9f3614dc175e6f7664af1f2ce.zip frameworks_av-065789f24890b0a9f3614dc175e6f7664af1f2ce.tar.gz frameworks_av-065789f24890b0a9f3614dc175e6f7664af1f2ce.tar.bz2 | |
Merge "Restore NuPlayer error and EOS handling" into klp-dev
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 e0686be..c36dd7c 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -1500,7 +1500,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(); } |