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_parse.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_parse.c')
| -rw-r--r-- | libavcodec/hevc_parse.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c index d6bf872303..6c1138e015 100644 --- a/libavcodec/hevc_parse.c +++ b/libavcodec/hevc_parse.c @@ -18,7 +18,7 @@ #include "bytestream.h" #include "h2645_parse.h" -#include "hevcdec.h" +#include "hevc.h" #include "hevc_parse.h" static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets *ps, @@ -38,25 +38,25 @@ static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets /* ignore everything except parameter sets and VCL NALUs */ switch (nal->type) { - case NAL_VPS: ff_hevc_decode_nal_vps(&nal->gb, logctx, ps); break; - case NAL_SPS: ff_hevc_decode_nal_sps(&nal->gb, logctx, ps, 1); break; - case NAL_PPS: ff_hevc_decode_nal_pps(&nal->gb, logctx, ps); break; - case NAL_TRAIL_R: - case NAL_TRAIL_N: - case NAL_TSA_N: - case NAL_TSA_R: - case NAL_STSA_N: - case NAL_STSA_R: - case NAL_BLA_W_LP: - case NAL_BLA_W_RADL: - case NAL_BLA_N_LP: - case NAL_IDR_W_RADL: - case NAL_IDR_N_LP: - case NAL_CRA_NUT: - case NAL_RADL_N: - case NAL_RADL_R: - case NAL_RASL_N: - case NAL_RASL_R: + case HEVC_NAL_VPS: ff_hevc_decode_nal_vps(&nal->gb, logctx, ps); break; + case HEVC_NAL_SPS: ff_hevc_decode_nal_sps(&nal->gb, logctx, ps, 1); break; + case HEVC_NAL_PPS: ff_hevc_decode_nal_pps(&nal->gb, logctx, ps); break; + case HEVC_NAL_TRAIL_R: + case HEVC_NAL_TRAIL_N: + case HEVC_NAL_TSA_N: + case HEVC_NAL_TSA_R: + case HEVC_NAL_STSA_N: + case HEVC_NAL_STSA_R: + case HEVC_NAL_BLA_W_LP: + case HEVC_NAL_BLA_W_RADL: + case HEVC_NAL_BLA_N_LP: + case HEVC_NAL_IDR_W_RADL: + case HEVC_NAL_IDR_N_LP: + case HEVC_NAL_CRA_NUT: + case HEVC_NAL_RADL_N: + case HEVC_NAL_RADL_R: + case HEVC_NAL_RASL_N: + case HEVC_NAL_RASL_R: av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit: %d\n", nal->type); ret = AVERROR_INVALIDDATA; goto done; |