diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:50:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:50:18 +0100 |
| commit | bf4d0f8328c8f64611ca44a6ffdc30ca4f028249 (patch) | |
| tree | e37df66f9571e2753a827c23ba8c075a8af5d323 /libavcodec/h264_direct.c | |
| parent | e168b508163d7dc05176d81e6b5ea73ac23eb38b (diff) | |
| parent | 7fa00653a550c0d24b3951c0f9fed6350ecf5ce4 (diff) | |
Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'
* commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
h264: add a parameter to the FIELD_PICTURE macro.
h264: add a parameter to the FRAME_MBAFF macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_direct.c')
| -rw-r--r-- | libavcodec/h264_direct.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 838aee7dcb..2f49d0ae6f 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -53,7 +53,7 @@ void ff_h264_direct_dist_scale_factor(H264Context * const h){ const int poc1 = h->ref_list[1][0].poc; int i, field; - if (FRAME_MBAFF) + if (FRAME_MBAFF(h)) for (field = 0; field < 2; field++){ const int poc = h->cur_pic_ptr->field_poc[field]; const int poc1 = h->ref_list[1][0].field_poc[field]; @@ -118,7 +118,7 @@ void ff_h264_direct_ref_list_init(H264Context * const h){ memcpy(cur->ref_poc [1], cur->ref_poc [0], sizeof(cur->ref_poc [0])); } - cur->mbaff= FRAME_MBAFF; + cur->mbaff = FRAME_MBAFF(h); h->col_fieldoff= 0; if(h->picture_structure == PICT_FRAME){ @@ -135,7 +135,7 @@ void ff_h264_direct_ref_list_init(H264Context * const h){ for(list=0; list<2; list++){ fill_colmap(h, h->map_col_to_list0, list, sidx, ref1sidx, 0); - if(FRAME_MBAFF) + if (FRAME_MBAFF(h)) for(field=0; field<2; field++) fill_colmap(h, h->map_col_to_list0_field[field], list, field, field, 1); } @@ -496,7 +496,7 @@ single_col: const int *dist_scale_factor = h->dist_scale_factor; int ref_offset; - if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){ + if (FRAME_MBAFF(h) && IS_INTERLACED(*mb_type)) { map_col_to_list0[0] = h->map_col_to_list0_field[h->mb_y&1][0]; map_col_to_list0[1] = h->map_col_to_list0_field[h->mb_y&1][1]; dist_scale_factor =h->dist_scale_factor_field[h->mb_y&1]; |