diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 20:02:11 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 20:02:11 -0300 |
| commit | dc39ccdc3b88e9ec3b4aa3581798c30660d94d07 (patch) | |
| tree | ea6dd9bc79af60d63fe0edd905158b3440db23d4 /libavcodec/hevc_parser.c | |
| parent | 0f4abbd4ee1c5b34068cb48ceab3515641d6e0fb (diff) | |
| parent | 0bfdcce4d42a6e654c00ea5f9237dc987626457f (diff) | |
Merge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'
* commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f':
hevc: move the SliceType enum to hevc.h
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/hevc_parser.c')
| -rw-r--r-- | libavcodec/hevc_parser.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index 2a5190dcb8..310428d0ff 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -360,14 +360,14 @@ static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, skip_bits(gb, 1); // slice_reserved_undetermined_flag[] sh->slice_type = get_ue_golomb(gb); - if (!(sh->slice_type == I_SLICE || sh->slice_type == P_SLICE || - sh->slice_type == B_SLICE)) { + if (!(sh->slice_type == HEVC_SLICE_I || sh->slice_type == HEVC_SLICE_P || + sh->slice_type == HEVC_SLICE_B)) { av_log(avctx, AV_LOG_ERROR, "Unknown slice type: %d.\n", sh->slice_type); return AVERROR_INVALIDDATA; } - s->pict_type = sh->slice_type == B_SLICE ? AV_PICTURE_TYPE_B : - sh->slice_type == P_SLICE ? AV_PICTURE_TYPE_P : + s->pict_type = sh->slice_type == HEVC_SLICE_B ? AV_PICTURE_TYPE_B : + sh->slice_type == HEVC_SLICE_P ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; if (ps->pps->output_flag_present_flag) |