diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:12 +0100 |
| commit | 4bd5ac200d15b4f458a50f66006549825f9fc865 (patch) | |
| tree | f9ee1ad485e2b388bbe3e9a772744d0383b05825 /libavcodec/svq3.c | |
| parent | 5355ed6b20e941430c4f8fb82644e87a65366d61 (diff) | |
h264: move {chroma,intra16x16}_pred_mode into the per-slice context
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index e6e4b0df7a..cad546bc61 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -660,9 +660,9 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) dir = i_mb_type_info[mb_type - 8].pred_mode; dir = (dir >> 1) ^ 3 * (dir & 1) ^ 1; - if ((h->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, dir, 0)) < 0) { + if ((sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, dir, 0)) < 0) { av_log(h->avctx, AV_LOG_ERROR, "ff_h264_check_intra_pred_mode < 0\n"); - return h->intra16x16_pred_mode; + return sl->intra16x16_pred_mode; } cbp = i_mb_type_info[mb_type - 8].cbp; @@ -764,7 +764,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) h->cur_pic.mb_type[mb_xy] = mb_type; if (IS_INTRA(mb_type)) - h->chroma_pred_mode = ff_h264_check_intra_pred_mode(h, DC_PRED8x8, 1); + sl->chroma_pred_mode = ff_h264_check_intra_pred_mode(h, DC_PRED8x8, 1); return 0; } |