diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-03-03 14:41:43 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-03-03 14:41:43 +0000 |
| commit | 70118abd687be136b5ae9fdc7cd75dfa002677ee (patch) | |
| tree | a8e877e1295c47862189339fba843b0f48fb06d5 /libavcodec/h264_refs.c | |
| parent | 72f86ec013714d15cdef4e9e541ab87f34b670ec (diff) | |
| download | ffmpeg-70118abd687be136b5ae9fdc7cd75dfa002677ee.tar.gz | |
Merge weight & offset tables, 15 cpu cycles faster.
Originally committed as revision 22169 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264_refs.c')
| -rw-r--r-- | libavcodec/h264_refs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index fa9afd1c8b..8549b5bdbd 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -315,11 +315,11 @@ void ff_h264_fill_mbaff_ref_list(H264Context *h){ field[1].reference = PICT_BOTTOM_FIELD; field[1].poc= field[1].field_poc[1]; - h->luma_weight[list][16+2*i] = h->luma_weight[list][16+2*i+1] = h->luma_weight[list][i]; - h->luma_offset[list][16+2*i] = h->luma_offset[list][16+2*i+1] = h->luma_offset[list][i]; + h->luma_weight[list][16+2*i][0] = h->luma_weight[list][16+2*i+1][0] = h->luma_weight[list][i][0]; + h->luma_weight[list][16+2*i][1] = h->luma_weight[list][16+2*i+1][1] = h->luma_weight[list][i][1]; for(j=0; j<2; j++){ - h->chroma_weight[list][16+2*i][j] = h->chroma_weight[list][16+2*i+1][j] = h->chroma_weight[list][i][j]; - h->chroma_offset[list][16+2*i][j] = h->chroma_offset[list][16+2*i+1][j] = h->chroma_offset[list][i][j]; + h->chroma_weight[list][16+2*i][j][0] = h->chroma_weight[list][16+2*i+1][j][0] = h->chroma_weight[list][i][j][0]; + h->chroma_weight[list][16+2*i][j][1] = h->chroma_weight[list][16+2*i+1][j][1] = h->chroma_weight[list][i][j][1]; } } } |