diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:58:11 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:59:16 +0100 |
commit | 6ec279b54c09f47208930021a38a742f2cc09324 (patch) | |
tree | c02bfae014bb7a1a3e1706ea8b82d0cc85d2eca0 /libavcodec/h264_cavlc.c | |
parent | 20f5be1038fcf9f88d5c74c16c01dd21584405b3 (diff) | |
parent | 64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e (diff) |
Merge commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e'
* commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e':
h264: move *_samples_available into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cavlc.c')
-rw-r--r-- | libavcodec/h264_cavlc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index ad299081cc..a08f8f4e1a 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -825,12 +825,12 @@ decode_intra_mb: 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); + sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, sl, sl->intra16x16_pred_mode, 0); if (sl->intra16x16_pred_mode < 0) return -1; } if(decode_chroma){ - pred_mode= ff_h264_check_intra_pred_mode(h, get_ue_golomb_31(&h->gb), 1); + pred_mode= ff_h264_check_intra_pred_mode(h, sl, get_ue_golomb_31(&h->gb), 1); if(pred_mode < 0) return -1; sl->chroma_pred_mode = pred_mode; |