diff options
| author | Adrian Grange <agrange@google.com> | 2014-01-22 08:34:48 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-22 08:34:48 -0800 |
| commit | c77c5413e06e4cb71bf918ee3a2a62297c108df6 (patch) | |
| tree | 53bc38ebc4ffeddea3780681c3eecb80c7377372 /vp9/decoder | |
| parent | 2b6e0fe01032b39476674f2cbacb4c30837ab24f (diff) | |
| parent | 3246692ebc5dee78aab0a63a363c1d50fe41ace7 (diff) | |
| download | libvpx-c77c5413e06e4cb71bf918ee3a2a62297c108df6.tar libvpx-c77c5413e06e4cb71bf918ee3a2a62297c108df6.tar.gz libvpx-c77c5413e06e4cb71bf918ee3a2a62297c108df6.tar.bz2 libvpx-c77c5413e06e4cb71bf918ee3a2a62297c108df6.zip | |
Merge "Force show_frame=1 when show_existing_frame=1"
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 59faccdf7..7b856d70f 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1129,11 +1129,12 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi, cm->show_existing_frame = vp9_rb_read_bit(rb); if (cm->show_existing_frame) { - // show an existing frame directly + // Show an existing frame directly. int frame_to_show = cm->ref_frame_map[vp9_rb_read_literal(rb, 3)]; ref_cnt_fb(cm->fb_idx_ref_cnt, &cm->new_fb_idx, frame_to_show); pbi->refresh_frame_flags = 0; cm->lf.filter_level = 0; + cm->show_frame = 1; return 0; } |