diff options
| author | James Zern <jzern@google.com> | 2015-07-02 01:52:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-02 01:52:21 +0000 |
| commit | 0ea304620cb4a506060c2b9b2164e4a45261145c (patch) | |
| tree | 9853031eba8e6e5f3e2cbe5b977819fb2a2ba5c0 /vp9/decoder/vp9_decodemv.c | |
| parent | 95dc082168f8e81b036e8cbe6c3eae369afd5f5e (diff) | |
| parent | e6add6499fccb1bfc3ea027e656f3fe111fe17bd (diff) | |
| download | libvpx-0ea304620cb4a506060c2b9b2164e4a45261145c.tar libvpx-0ea304620cb4a506060c2b9b2164e4a45261145c.tar.gz libvpx-0ea304620cb4a506060c2b9b2164e4a45261145c.tar.bz2 libvpx-0ea304620cb4a506060c2b9b2164e4a45261145c.zip | |
Merge "vp9_pred_common: inline vp9_get_segment_id"
Diffstat (limited to 'vp9/decoder/vp9_decodemv.c')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index cd20c84cf..f6c553538 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -155,7 +155,7 @@ static int read_inter_segment_id(VP9_COMMON *const cm, MACROBLOCKD *const xd, return 0; // Default for disabled segmentation predicted_segment_id = cm->last_frame_seg_map ? - vp9_get_segment_id(cm, cm->last_frame_seg_map, bsize, mi_row, mi_col) : 0; + get_segment_id(cm, cm->last_frame_seg_map, bsize, mi_row, mi_col) : 0; if (!seg->update_map) { copy_segment_id(cm, cm->last_frame_seg_map, cm->current_frame_seg_map, |