diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:35:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:35:38 +0100 |
| commit | a2740a060b36f6612043fa3128f4eb6197d0ce13 (patch) | |
| tree | f8420993f59d3f5e6fc1a3284862aea4ae6cac3d /libavcodec/svq3.c | |
| parent | c07b7e483af6a0bee49c0ac46030d9b10be4913b (diff) | |
| parent | 4bd5ac200d15b4f458a50f66006549825f9fc865 (diff) | |
| download | ffmpeg-a2740a060b36f6612043fa3128f4eb6197d0ce13.tar.gz | |
Merge commit '4bd5ac200d15b4f458a50f66006549825f9fc865'
* commit '4bd5ac200d15b4f458a50f66006549825f9fc865':
h264: move {chroma,intra16x16}_pred_mode into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 cd3d28f184..410c4f63ae 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -667,9 +667,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; @@ -771,7 +771,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; } |