diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:59:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:18:10 +0100 |
| commit | cc2cfdc49786a8268d1514661c17ea96035d6f1d (patch) | |
| tree | fd17d2f29472b84fce724d66fc982ee51f7cd42f /libavcodec/h264_cavlc.c | |
| parent | 27b3522ba3cf539e13bb0f8f9c68d2dd513a8f73 (diff) | |
| parent | 95eb35f30513e335990ad0d5dca6ddc318477291 (diff) | |
| download | ffmpeg-cc2cfdc49786a8268d1514661c17ea96035d6f1d.tar.gz | |
Merge commit '95eb35f30513e335990ad0d5dca6ddc318477291'
* commit '95eb35f30513e335990ad0d5dca6ddc318477291':
h264: move the ref lists variables into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_picture.c
libavcodec/h264_refs.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 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 08180a546b..33981a6b57 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -794,8 +794,8 @@ decode_intra_mb: return 0; } - local_ref_count[0] = h->ref_count[0] << MB_MBAFF(h); - local_ref_count[1] = h->ref_count[1] << MB_MBAFF(h); + local_ref_count[0] = sl->ref_count[0] << MB_MBAFF(h); + local_ref_count[1] = sl->ref_count[1] << MB_MBAFF(h); fill_decode_neighbors(h, sl, mb_type); fill_decode_caches(h, sl, mb_type); @@ -875,7 +875,7 @@ decode_intra_mb: } } - for(list=0; list<h->list_count; list++){ + for (list = 0; list < sl->list_count; list++) { int ref_count = IS_REF0(mb_type) ? 1 : local_ref_count[list]; for(i=0; i<4; i++){ if(IS_DIRECT(sl->sub_mb_type[i])) continue; @@ -903,7 +903,7 @@ decode_intra_mb: if(dct8x8_allowed) dct8x8_allowed = get_dct8x8_allowed(h, sl); - for(list=0; list<h->list_count; list++){ + for (list = 0; list < sl->list_count; list++) { for(i=0; i<4; i++){ if(IS_DIRECT(sl->sub_mb_type[i])) { sl->ref_cache[list][ scan8[4*i] ] = sl->ref_cache[list][ scan8[4*i]+1 ]; @@ -953,7 +953,7 @@ decode_intra_mb: int list, mx, my, i; //FIXME we should set ref_idx_l? to 0 if we use that later ... if(IS_16X16(mb_type)){ - for(list=0; list<h->list_count; list++){ + for (list = 0; list < sl->list_count; list++) { unsigned int val; if(IS_DIR(mb_type, 0, list)){ if(local_ref_count[list]==1){ @@ -970,7 +970,7 @@ decode_intra_mb: fill_rectangle(&sl->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); } } - for(list=0; list<h->list_count; list++){ + for (list = 0; list < sl->list_count; list++) { if(IS_DIR(mb_type, 0, list)){ pred_motion(h, sl, 0, 4, list, sl->ref_cache[list][ scan8[0] ], &mx, &my); mx += get_se_golomb(&h->gb); @@ -982,7 +982,7 @@ decode_intra_mb: } } else if(IS_16X8(mb_type)){ - for(list=0; list<h->list_count; list++){ + for (list = 0; list < sl->list_count; list++) { for(i=0; i<2; i++){ unsigned int val; if(IS_DIR(mb_type, i, list)){ @@ -1002,7 +1002,7 @@ decode_intra_mb: fill_rectangle(&sl->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); } } - for(list=0; list<h->list_count; list++){ + for (list = 0; list < sl->list_count; list++) { for(i=0; i<2; i++){ unsigned int val; if(IS_DIR(mb_type, i, list)){ @@ -1019,7 +1019,7 @@ decode_intra_mb: } }else{ av_assert2(IS_8X16(mb_type)); - for(list=0; list<h->list_count; list++){ + for (list = 0; list < sl->list_count; list++) { for(i=0; i<2; i++){ unsigned int val; if(IS_DIR(mb_type, i, list)){ //FIXME optimize @@ -1039,7 +1039,7 @@ decode_intra_mb: fill_rectangle(&sl->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); } } - for(list=0; list<h->list_count; list++){ + for (list = 0; list < sl->list_count; list++) { for(i=0; i<2; i++){ unsigned int val; if(IS_DIR(mb_type, i, list)){ |