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/cbs.h | |
| 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/cbs.h')
| -rw-r--r-- | libavcodec/cbs.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h index 5260a39c63..fe57e7b2a5 100644 --- a/libavcodec/cbs.h +++ b/libavcodec/cbs.h @@ -380,10 +380,12 @@ int ff_cbs_insert_unit_data(CodedBitstreamContext *ctx, /** * Delete a unit from a fragment and free all memory it uses. + * + * Requires position to be >= 0 and < frag->nb_units. */ -int ff_cbs_delete_unit(CodedBitstreamContext *ctx, - CodedBitstreamFragment *frag, - int position); +void ff_cbs_delete_unit(CodedBitstreamContext *ctx, + CodedBitstreamFragment *frag, + int position); #endif /* AVCODEC_CBS_H */ |