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/h264_cabac.c | |
parent | c07b7e483af6a0bee49c0ac46030d9b10be4913b (diff) | |
parent | 4bd5ac200d15b4f458a50f66006549825f9fc865 (diff) | |
download | ffmpeg-streaming-a2740a060b36f6612043fa3128f4eb6197d0ce13.zip ffmpeg-streaming-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/h264_cabac.c')
-rw-r--r-- | libavcodec/h264_cabac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 35ae3fd..8a85912 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1992,7 +1992,7 @@ int ff_h264_decode_mb_cabac(H264Context *h, H264SliceContext *sl) decode_intra_mb: partition_count = 0; cbp= i_mb_type_info[mb_type].cbp; - h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; + sl->intra16x16_pred_mode = i_mb_type_info[mb_type].pred_mode; mb_type= i_mb_type_info[mb_type].type; } if(MB_FIELD(h)) @@ -2061,8 +2061,8 @@ decode_intra_mb: write_back_intra_pred_mode(h); if( ff_h264_check_intra4x4_pred_mode(h) < 0 ) return -1; } else { - h->intra16x16_pred_mode= ff_h264_check_intra_pred_mode( h, h->intra16x16_pred_mode, 0 ); - if( h->intra16x16_pred_mode < 0 ) return -1; + sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, sl->intra16x16_pred_mode, 0); + if (sl->intra16x16_pred_mode < 0) return -1; } if(decode_chroma){ h->chroma_pred_mode_table[mb_xy] = @@ -2070,9 +2070,9 @@ decode_intra_mb: pred_mode= ff_h264_check_intra_pred_mode( h, pred_mode, 1 ); if( pred_mode < 0 ) return -1; - h->chroma_pred_mode= pred_mode; + sl->chroma_pred_mode = pred_mode; } else { - h->chroma_pred_mode= DC_128_PRED8x8; + sl->chroma_pred_mode = DC_128_PRED8x8; } } else if( partition_count == 4 ) { int i, j, sub_partition_count[4], list, ref[2][4]; |