diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 19:13:24 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 19:13:24 +0300 |
| commit | 55215383dc04365935c86f8a4db7b5396f1e3541 (patch) | |
| tree | 416380f73859591236b30e05a5213f66525c6822 /libavcodec/h264_refs.c | |
| parent | 727b202330712eb981eb008b1e7a936d71092f71 (diff) | |
| parent | f42485dbce614b3f63182845da43db690b427b7c (diff) | |
Merge commit 'f42485dbce614b3f63182845da43db690b427b7c'
* commit 'f42485dbce614b3f63182845da43db690b427b7c':
h264: use a separate GetBitContext for slice data
Conflicts:
libavcodec/h264.c
libavcodec/h264_cavlc.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 f113e5535a..6c7ec60e68 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -221,11 +221,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; @@ -241,7 +241,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) { @@ -272,7 +272,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); |