diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-27 14:39:06 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:14 +0100 |
| commit | f42485dbce614b3f63182845da43db690b427b7c (patch) | |
| tree | 7e776eca6a3c8fe0239074481a0310d9eb591919 /libavcodec/h264_refs.c | |
| parent | 2ea00e35e4e0b58f7a306dd55d8f72a21c32c946 (diff) | |
| download | ffmpeg-f42485dbce614b3f63182845da43db690b427b7c.tar.gz | |
h264: use a separate GetBitContext for slice data
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 271264cba9..04cfa9eec3 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -223,11 +223,11 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) for (i = 0; i < sl->ref_count[list]; i++) COPY_PICTURE(&sl->ref_list[list][i], &h->default_ref_list[list][i]); - if (get_bits1(&h->gb)) { // ref_pic_list_modification_flag_l[01] + if (get_bits1(&sl->gb)) { // ref_pic_list_modification_flag_l[01] int pred = h->curr_pic_num; for (index = 0; ; index++) { - unsigned int modification_of_pic_nums_idc = get_ue_golomb_31(&h->gb); + unsigned int modification_of_pic_nums_idc = get_ue_golomb_31(&sl->gb); unsigned int pic_id; int i; H264Picture *ref = NULL; @@ -243,7 +243,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) switch (modification_of_pic_nums_idc) { case 0: case 1: { - const unsigned int abs_diff_pic_num = get_ue_golomb(&h->gb) + 1; + const unsigned int abs_diff_pic_num = get_ue_golomb(&sl->gb) + 1; int frame_num; if (abs_diff_pic_num > h->max_pic_num) { @@ -274,7 +274,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) } case 2: { int long_idx; - pic_id = get_ue_golomb(&h->gb); // long_term_pic_idx + pic_id = get_ue_golomb(&sl->gb); // long_term_pic_idx long_idx = pic_num_extract(h, pic_id, &pic_structure); |