diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 14:27:48 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 14:27:48 -0300 |
| commit | 6397815be0bee10948387fcb90ead36ec2834ef7 (patch) | |
| tree | e616efad05f1147821dd80f88dae04707d795193 /libavcodec/hevc_refs.c | |
| parent | a1a80a6c9ce5309632a8b5c0241fa5ffcd09b5fc (diff) | |
| parent | c359d624d3efc3fd1d83210d78c4152bd329b765 (diff) | |
| download | ffmpeg-6397815be0bee10948387fcb90ead36ec2834ef7.tar.gz | |
Merge commit 'c359d624d3efc3fd1d83210d78c4152bd329b765'
* commit 'c359d624d3efc3fd1d83210d78c4152bd329b765':
hevcdec: move decoder-independent declarations into a separate header
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/hevc_refs.c')
| -rw-r--r-- | libavcodec/hevc_refs.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index aa1162735c..db1ac2bf90 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -26,6 +26,7 @@ #include "internal.h" #include "thread.h" +#include "hevc.h" #include "hevcdec.h" void ff_hevc_unref_frame(HEVCContext *s, HEVCFrame *frame, int flags) @@ -386,7 +387,7 @@ static HEVCFrame *find_ref_idx(HEVCContext *s, int poc) } } - if (s->nal_unit_type != NAL_CRA_NUT && !IS_BLA(s)) + if (s->nal_unit_type != HEVC_NAL_CRA_NUT && !IS_BLA(s)) av_log(s->avctx, AV_LOG_ERROR, "Could not find ref with POC %d\n", poc); return NULL; @@ -530,9 +531,9 @@ int ff_hevc_compute_poc(HEVCContext *s, int poc_lsb) poc_msb = prev_poc_msb; // For BLA picture types, POCmsb is set to 0. - if (s->nal_unit_type == NAL_BLA_W_LP || - s->nal_unit_type == NAL_BLA_W_RADL || - s->nal_unit_type == NAL_BLA_N_LP) + if (s->nal_unit_type == HEVC_NAL_BLA_W_LP || + s->nal_unit_type == HEVC_NAL_BLA_W_RADL || + s->nal_unit_type == HEVC_NAL_BLA_N_LP) poc_msb = 0; return poc_msb + poc_lsb; |