diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 22:06:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 22:28:54 +0200 |
| commit | d5fcca83b915df9536d595a1a44c24294b606836 (patch) | |
| tree | e414b8d967bf761a6be218d4f16b6796d928d590 /libavcodec/hevc_sei.c | |
| parent | 885afff01c720cc0a3c52802bd7f82bb81d9e576 (diff) | |
| parent | b11acd57326db6c2cc1475dd0bea2a06fbc85aa2 (diff) | |
Merge commit 'b11acd57326db6c2cc1475dd0bea2a06fbc85aa2'
* commit 'b11acd57326db6c2cc1475dd0bea2a06fbc85aa2':
hevc: remove HEVCContext usage from hevc_ps
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_cabac.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevcpred_template.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/hevc_sei.c')
| -rw-r--r-- | libavcodec/hevc_sei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 13ebcd3ede..8ae680e5eb 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -94,9 +94,9 @@ static int decode_pic_timing(HEVCContext *s) GetBitContext *gb = &s->HEVClc->gb; HEVCSPS *sps; - if (!s->sps_list[s->active_seq_parameter_set_id]) + if (!s->ps.sps_list[s->active_seq_parameter_set_id]) return(AVERROR(ENOMEM)); - sps = (HEVCSPS*)s->sps_list[s->active_seq_parameter_set_id]->data; + sps = (HEVCSPS*)s->ps.sps_list[s->active_seq_parameter_set_id]->data; if (sps->vui.frame_field_info_present_flag) { int pic_struct = get_bits(gb, 4); |