diff options
| author | Andreas Huber <andih@google.com> | 2011-02-08 11:47:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-08 11:47:23 -0800 |
| commit | cd334d7a8e9df05f6b94eefbad2bddda0850f2cf (patch) | |
| tree | 02e17ff351045cb82cede672e48cf8f0faafc62c /media | |
| parent | b93d55d9f6e154629d47270970e0a0ace5a1b0a0 (diff) | |
| parent | 576c3f65d7ad166c21ef09342a2a321e57666af4 (diff) | |
| download | frameworks_av-cd334d7a8e9df05f6b94eefbad2bddda0850f2cf.zip frameworks_av-cd334d7a8e9df05f6b94eefbad2bddda0850f2cf.tar.gz frameworks_av-cd334d7a8e9df05f6b94eefbad2bddda0850f2cf.tar.bz2 | |
Merge "Remove one log message from the VPXDecoder"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/on2/dec/VPXDecoder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp b/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp index 9433178..489e5ad 100644 --- a/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp +++ b/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp @@ -205,7 +205,9 @@ status_t VPXDecoder::read( vpx_image_t *img = vpx_codec_get_frame((vpx_codec_ctx_t *)mCtx, &iter); if (img == NULL) { - LOGI("on2 decoder did not return a frame."); + // The VPX format supports "internal-only" frames that are + // referenced by future content but never actually displayed, so + // this is a perfectly valid scenario. *out = new MediaBuffer(0); return OK; |