diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:13 +0100 |
| commit | 56febc993b928ccc039a32158ca60b234c311875 (patch) | |
| tree | cf903dfec7dc8d31049ad427fb9265363e1b1988 /libavcodec/h264_refs.c | |
| parent | 5f390eef8ee2b8adab00c5d2923a52aa261eb999 (diff) | |
| download | ffmpeg-56febc993b928ccc039a32158ca60b234c311875.tar.gz | |
h264: move the slice type variables into the per-slice context
Diffstat (limited to 'libavcodec/h264_refs.c')
| -rw-r--r-- | libavcodec/h264_refs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 3357d2cc94..5ecc9ee407 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -116,11 +116,11 @@ static int add_sorted(H264Picture **sorted, H264Picture **src, int len, int limi return out_i; } -int ff_h264_fill_default_ref_list(H264Context *h) +int ff_h264_fill_default_ref_list(H264Context *h, H264SliceContext *sl) { int i, len; - if (h->slice_type_nos == AV_PICTURE_TYPE_B) { + if (sl->slice_type_nos == AV_PICTURE_TYPE_B) { H264Picture *sorted[32]; int cur_poc, list; int lens[2]; @@ -174,7 +174,7 @@ int ff_h264_fill_default_ref_list(H264Context *h) h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].f.data[0]); } - if (h->slice_type_nos == AV_PICTURE_TYPE_B) { + if (sl->slice_type_nos == AV_PICTURE_TYPE_B) { for (i = 0; i < h->ref_count[1]; i++) { tprintf(h->avctx, "List1: %s fn:%d 0x%p\n", (h->default_ref_list[1][i].long_ref ? "LT" : "ST"), |