diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-06-07 11:54:20 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-06-07 13:57:55 -0700 |
| commit | 6462afe0889215041099e064954f0c52df929b11 (patch) | |
| tree | 1e2378569c041a214b48a54502068db019975c90 /vp9/encoder/vp9_bitstream.c | |
| parent | 28164eb9624f716a92e65b8b82c7164a38a44ec0 (diff) | |
| download | libvpx-6462afe0889215041099e064954f0c52df929b11.tar libvpx-6462afe0889215041099e064954f0c52df929b11.tar.gz libvpx-6462afe0889215041099e064954f0c52df929b11.tar.bz2 libvpx-6462afe0889215041099e064954f0c52df929b11.zip | |
Fix ref_frame segment feature when it is intra.
Change-Id: Ifbf790c14cee0c08a27f6728e3c637404e1f8477
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 55ed2a450..d89cebd4c 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -561,7 +561,9 @@ static void pack_inter_mode_mvs(VP9_COMP *cpi, MODE_INFO *m, vp9_get_pred_prob(pc, xd, PRED_MBSKIP)); } - vp9_write(bc, rf != INTRA_FRAME, vp9_get_pred_prob(pc, xd, PRED_INTRA_INTER)); + if (!vp9_segfeature_active(xd, segment_id, SEG_LVL_REF_FRAME)) + vp9_write(bc, rf != INTRA_FRAME, + vp9_get_pred_prob(pc, xd, PRED_INTRA_INTER)); if (mi->sb_type >= BLOCK_SIZE_SB8X8 && pc->txfm_mode == TX_MODE_SELECT && !(rf != INTRA_FRAME && |