diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-03-18 00:11:56 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-03-24 23:33:24 +0100 |
| commit | 7272d0c0a981db2b7416933e8ba0bbc26699fc8c (patch) | |
| tree | 77bd19328a481e85fc47cb91861cd20f0684e898 /libavcodec | |
| parent | 557668e8cbd9695cc45a1135e158b81b5c2b6496 (diff) | |
| download | ffmpeg-7272d0c0a981db2b7416933e8ba0bbc26699fc8c.tar.gz | |
avcodec/hevc, h2645_parse: Fix HEVC NAL unit names and constants
This commit fixes the names and constants of the reserved NAL units
with nal_unit_type 22 resp. 23. They were "IRAP_IRAP_VLC2x", but are
actually "RSV_IRAP_VLC2x".
This also required a change to cbs_h265_syntax_template.c.
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/cbs_h265_syntax_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/h2645_parse.c | 4 | ||||
| -rw-r--r-- | libavcodec/hevc.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 15114548c6..180a045c34 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -1275,7 +1275,7 @@ static int FUNC(slice_segment_header)(CodedBitstreamContext *ctx, RWContext *rw, flag(first_slice_segment_in_pic_flag); if (current->nal_unit_header.nal_unit_type >= HEVC_NAL_BLA_W_LP && - current->nal_unit_header.nal_unit_type <= HEVC_NAL_IRAP_VCL23) + current->nal_unit_header.nal_unit_type <= HEVC_NAL_RSV_IRAP_VCL23) flag(no_output_of_prior_pics_flag); ue(slice_pic_parameter_set_id, 0, 63); diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 0f3343004f..2e03871640 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -169,8 +169,8 @@ static const char *hevc_nal_type_name[64] = { "IDR_W_RADL", // HEVC_NAL_IDR_W_RADL "IDR_N_LP", // HEVC_NAL_IDR_N_LP "CRA_NUT", // HEVC_NAL_CRA_NUT - "IRAP_IRAP_VCL22", // HEVC_NAL_IRAP_VCL22 - "IRAP_IRAP_VCL23", // HEVC_NAL_IRAP_VCL23 + "RSV_IRAP_VCL22", // HEVC_NAL_RSV_IRAP_VCL22 + "RSV_IRAP_VCL23", // HEVC_NAL_RSV_IRAP_VCL23 "RSV_VCL24", // HEVC_NAL_RSV_VCL24 "RSV_VCL25", // HEVC_NAL_RSV_VCL25 "RSV_VCL26", // HEVC_NAL_RSV_VCL26 diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 56b5541d90..e15d89fa95 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -48,8 +48,8 @@ enum HEVCNALUnitType { HEVC_NAL_IDR_W_RADL = 19, HEVC_NAL_IDR_N_LP = 20, HEVC_NAL_CRA_NUT = 21, - HEVC_NAL_IRAP_VCL22 = 22, - HEVC_NAL_IRAP_VCL23 = 23, + HEVC_NAL_RSV_IRAP_VCL22 = 22, + HEVC_NAL_RSV_IRAP_VCL23 = 23, HEVC_NAL_RSV_VCL24 = 24, HEVC_NAL_RSV_VCL25 = 25, HEVC_NAL_RSV_VCL26 = 26, |