diff options
| author | James Almer <jamrial@gmail.com> | 2017-05-05 20:02:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-05 20:10:17 -0300 |
| commit | 859cc5c8e662f8975129ab7f124894d80be7f7f3 (patch) | |
| tree | 7b5eaca177617074f40ee334e99b302d6fd4b065 /libavcodec/hevc_parser.c | |
| parent | 214f4133c4cbcfd53fe40cda666d0be3933d4c11 (diff) | |
| download | ffmpeg-859cc5c8e662f8975129ab7f124894d80be7f7f3.tar.gz | |
avcodec/hevc_parser: cosmetics
Reduces differences with libav slightly.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/hevc_parser.c')
| -rw-r--r-- | libavcodec/hevc_parser.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index 4bec0a7227..d6102f3ab9 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -173,14 +173,14 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal, * @param buf buffer with field/frame data. * @param buf_size size of the buffer. */ -static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, +static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, int buf_size, AVCodecContext *avctx) { HEVCParserContext *ctx = s->priv_data; HEVCParamSets *ps = &ctx->ps; HEVCSEIContext *sei = &ctx->sei; int is_global = buf == avctx->extradata; - int i, ret; + int ret, i; /* set some sane default values */ s->pict_type = AV_PICTURE_TYPE_I; @@ -218,16 +218,16 @@ static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, case HEVC_NAL_TSA_R: case HEVC_NAL_STSA_N: case HEVC_NAL_STSA_R: - case HEVC_NAL_RADL_N: - case HEVC_NAL_RADL_R: - case HEVC_NAL_RASL_N: - case HEVC_NAL_RASL_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: if (is_global) { av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit: %d\n", nal->type); @@ -290,8 +290,7 @@ static int hevc_find_frame_end(AVCodecParserContext *s, const uint8_t *buf, return END_NOT_FOUND; } -static int hevc_parse(AVCodecParserContext *s, - AVCodecContext *avctx, +static int hevc_parse(AVCodecParserContext *s, AVCodecContext *avctx, const uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size) { |