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_mp4toannexb_bsf.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_mp4toannexb_bsf.c')
| -rw-r--r-- | libavcodec/hevc_mp4toannexb_bsf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/hevc_mp4toannexb_bsf.c b/libavcodec/hevc_mp4toannexb_bsf.c index 9002a98c4f..09bce5b34c 100644 --- a/libavcodec/hevc_mp4toannexb_bsf.c +++ b/libavcodec/hevc_mp4toannexb_bsf.c @@ -27,7 +27,7 @@ #include "avcodec.h" #include "bsf.h" #include "bytestream.h" -#include "hevcdec.h" +#include "hevc.h" #define MIN_HEVCC_LENGTH 23 @@ -55,8 +55,8 @@ static int hevc_extradata_to_annexb(AVBSFContext *ctx) int type = bytestream2_get_byte(&gb) & 0x3f; int cnt = bytestream2_get_be16(&gb); - if (!(type == NAL_VPS || type == NAL_SPS || type == NAL_PPS || - type == NAL_SEI_PREFIX || type == NAL_SEI_SUFFIX)) { + if (!(type == HEVC_NAL_VPS || type == HEVC_NAL_SPS || type == HEVC_NAL_PPS || + type == HEVC_NAL_SEI_PREFIX || type == HEVC_NAL_SEI_SUFFIX)) { av_log(ctx, AV_LOG_ERROR, "Invalid NAL unit type in extradata: %d\n", type); ret = AVERROR_INVALIDDATA; |