diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:07:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:07:01 +0100 |
| commit | 9d0450ae943a7d1071fa59bfd0c4f7647d733c5f (patch) | |
| tree | d1ebfb43b856fa79589c3e67580e7e6deb631c1b /libavcodec/h264_cavlc.c | |
| parent | d511dc653062502ac7a86d9ef47ffeabd6f77364 (diff) | |
| parent | e9b2383bf86b38ad18a001801aee20c8182e29bd (diff) | |
| download | ffmpeg-9d0450ae943a7d1071fa59bfd0c4f7647d733c5f.tar.gz | |
Merge commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd'
* commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd':
h264: move mb_mbaff into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cavlc.c')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 45e2096849..0e26ff22ae 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -723,7 +723,7 @@ int ff_h264_decode_mb_cavlc(H264Context *h, H264SliceContext *sl) if (sl->mb_skip_run--) { if (FRAME_MBAFF(h) && (sl->mb_y & 1) == 0) { if (sl->mb_skip_run == 0) - h->mb_mbaff = sl->mb_field_decoding_flag = get_bits1(&sl->gb); + sl->mb_mbaff = sl->mb_field_decoding_flag = get_bits1(&sl->gb); } decode_mb_skip(h, sl); return 0; @@ -731,7 +731,7 @@ int ff_h264_decode_mb_cavlc(H264Context *h, H264SliceContext *sl) } if (FRAME_MBAFF(h)) { if ((sl->mb_y & 1) == 0) - h->mb_mbaff = sl->mb_field_decoding_flag = get_bits1(&sl->gb); + sl->mb_mbaff = sl->mb_field_decoding_flag = get_bits1(&sl->gb); } sl->prev_mb_skipped = 0; @@ -794,8 +794,8 @@ decode_intra_mb: return 0; } - local_ref_count[0] = sl->ref_count[0] << MB_MBAFF(h); - local_ref_count[1] = sl->ref_count[1] << MB_MBAFF(h); + local_ref_count[0] = sl->ref_count[0] << MB_MBAFF(sl); + local_ref_count[1] = sl->ref_count[1] << MB_MBAFF(sl); fill_decode_neighbors(h, sl, mb_type); fill_decode_caches(h, sl, mb_type); |