diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:35:02 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:35:05 +0300 |
| commit | c07b7e483af6a0bee49c0ac46030d9b10be4913b (patch) | |
| tree | 1974d662325f6ecd0fc41c76ae6e1b7d73def4b0 /libavcodec/h264_mvpred.h | |
| parent | acd6b407c3cebc6dda899820d65e75ad1d75eb63 (diff) | |
| parent | 5355ed6b20e941430c4f8fb82644e87a65366d61 (diff) | |
Merge commit '5355ed6b20e941430c4f8fb82644e87a65366d61'
* commit '5355ed6b20e941430c4f8fb82644e87a65366d61':
h264: move {prev,next}_mb_skipped into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mvpred.h')
| -rw-r--r-- | libavcodec/h264_mvpred.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 278be61382..38ffd0604d 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -824,7 +824,7 @@ static void av_unused decode_mb_skip(H264Context *h, H264SliceContext *sl) h->cur_pic.mb_type[mb_xy] = mb_type; h->cur_pic.qscale_table[mb_xy] = sl->qscale; h->slice_table[mb_xy] = h->slice_num; - h->prev_mb_skipped = 1; + sl->prev_mb_skipped = 1; } #endif /* AVCODEC_H264_MVPRED_H */ |