diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:30:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:30:19 +0100 |
| commit | 97c8ecaadab4e246d969fadd44072025b64747e4 (patch) | |
| tree | 0261278a3cfd7a66ff9875eb6d5722d68d375477 /libavcodec/h264_direct.c | |
| parent | 2cc08cad9ecf2d2524bc572a4e9bbe659b330d5c (diff) | |
| parent | 56febc993b928ccc039a32158ca60b234c311875 (diff) | |
Merge commit '56febc993b928ccc039a32158ca60b234c311875'
* commit '56febc993b928ccc039a32158ca60b234c311875':
h264: move the slice type variables into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_direct.c')
| -rw-r--r-- | libavcodec/h264_direct.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index daf21be116..ec5f476605 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -104,7 +104,7 @@ static void fill_colmap(H264Context *h, int map[2][16 + 32], int list, } } -void ff_h264_direct_ref_list_init(H264Context *const h) +void ff_h264_direct_ref_list_init(H264Context *const h, H264SliceContext *sl) { H264Picture *const ref1 = &h->ref_list[1][0]; H264Picture *const cur = h->cur_pic_ptr; @@ -140,7 +140,7 @@ void ff_h264_direct_ref_list_init(H264Context *const h) h->col_fieldoff = 2 * h->ref_list[1][0].reference - 3; } - if (h->slice_type_nos != AV_PICTURE_TYPE_B || h->direct_spatial_mv_pred) + if (sl->slice_type_nos != AV_PICTURE_TYPE_B || h->direct_spatial_mv_pred) return; for (list = 0; list < 2; list++) { |