diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:44:38 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:44:38 +0300 |
commit | 6abd1e901c065280d50adbbf95eb54773870328c (patch) | |
tree | 69ff8bd6a5d99e25696cf21bdb05a8b3016ffa59 /libavcodec/h264_cavlc.c | |
parent | 61635c7a8822d13bc8da69e116f40738be43539a (diff) | |
parent | 7d8154edd594981e7891d57de91f2260f8a62939 (diff) |
Merge commit '7d8154edd594981e7891d57de91f2260f8a62939'
* commit '7d8154edd594981e7891d57de91f2260f8a62939':
h264: move intra4x4_pred_mode[_cache] into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cavlc.c')
-rw-r--r-- | libavcodec/h264_cavlc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index df6d9a0ead..ad299081cc 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -809,7 +809,7 @@ decode_intra_mb: // fill_intra4x4_pred_table(h); for(i=0; i<16; i+=di){ - int mode= pred_intra_mode(h, i); + int mode = pred_intra_mode(h, sl, i); if(!get_bits1(&h->gb)){ const int rem_mode= get_bits(&h->gb, 3); @@ -817,12 +817,12 @@ decode_intra_mb: } if(di==4) - fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); + fill_rectangle(&sl->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1); else - h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; + sl->intra4x4_pred_mode_cache[scan8[i]] = mode; } - write_back_intra_pred_mode(h); - if( ff_h264_check_intra4x4_pred_mode(h) < 0) + write_back_intra_pred_mode(h, sl); + if (ff_h264_check_intra4x4_pred_mode(h, sl) < 0) return -1; }else{ sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, sl->intra16x16_pred_mode, 0); |