diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-05-22 11:55:19 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-22 11:55:19 -0700 |
| commit | 3b72ed50b404f3199999d82eee7ebaffbce47f24 (patch) | |
| tree | 57ae0b076ff4fb0935e4d736e4aef05b4827b084 /vp9/decoder/vp9_decoder.c | |
| parent | 56966ea8cedc6217d11a932e977f2165e39708f4 (diff) | |
| parent | e7135a93440c2d8ef79f87b9df542c43277b6f43 (diff) | |
| download | libvpx-3b72ed50b404f3199999d82eee7ebaffbce47f24.tar libvpx-3b72ed50b404f3199999d82eee7ebaffbce47f24.tar.gz libvpx-3b72ed50b404f3199999d82eee7ebaffbce47f24.tar.bz2 libvpx-3b72ed50b404f3199999d82eee7ebaffbce47f24.zip | |
Merge "Removing decoded_key_frame flag."
Diffstat (limited to 'vp9/decoder/vp9_decoder.c')
| -rw-r--r-- | vp9/decoder/vp9_decoder.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c index 8902f179d..13d79ff44 100644 --- a/vp9/decoder/vp9_decoder.c +++ b/vp9/decoder/vp9_decoder.c @@ -67,7 +67,6 @@ VP9Decoder *vp9_decoder_create() { cm->current_video_frame = 0; pbi->ready_for_new_data = 1; - pbi->decoded_key_frame = 0; // vp9_init_dequantizer() is first called here. Add check in // frame_init_dequantizer() to avoid unnecessary calling of @@ -267,15 +266,7 @@ int vp9_receive_compressed_data(VP9Decoder *pbi, cm->error.setjmp = 1; - retcode = vp9_decode_frame(pbi, source, source + size, psource); - - if (retcode < 0) { - cm->error.error_code = VPX_CODEC_ERROR; - cm->error.setjmp = 0; - if (cm->frame_bufs[cm->new_fb_idx].ref_count > 0) - cm->frame_bufs[cm->new_fb_idx].ref_count--; - return retcode; - } + vp9_decode_frame(pbi, source, source + size, psource); swap_frame_buffers(pbi); |