diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-07-08 01:14:01 +0200 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2019-07-08 22:59:41 +0100 |
| commit | 730e5be3aa1118a63132122dd06aa4f3311af07d (patch) | |
| tree | 21fee671a0a2538df4ecba1bbf2e48b5c036b23b /libavcodec/h264_metadata_bsf.c | |
| parent | 70a4f46e48da8bc8a547e490f67dde5165227dd8 (diff) | |
| download | ffmpeg-730e5be3aa1118a63132122dd06aa4f3311af07d.tar.gz | |
cbs: ff_cbs_delete_unit: Replace return value with assert
ff_cbs_delete_unit never fails if the index of the unit to delete is
valid, as it is with all current callers of the function. So just assert
in ff_cbs_delete_unit that the index is valid and change the return
value to void in order to remove the callers' checks for whether
ff_cbs_delete_unit failed.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/h264_metadata_bsf.c')
| -rw-r--r-- | libavcodec/h264_metadata_bsf.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index f7ca1f0f09..e40baa3371 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -427,13 +427,7 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) if (ctx->delete_filler) { for (i = au->nb_units - 1; i >= 0; i--) { if (au->units[i].type == H264_NAL_FILLER_DATA) { - // Filler NAL units. - err = ff_cbs_delete_unit(ctx->cbc, au, i); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to delete " - "filler NAL.\n"); - goto fail; - } + ff_cbs_delete_unit(ctx->cbc, au, i); continue; } |