diff options
| author | Gyan Doshi <ffmpeg@gyani.pro> | 2023-01-29 16:52:04 +0530 |
|---|---|---|
| committer | Gyan Doshi <ffmpeg@gyani.pro> | 2023-02-09 14:38:28 +0530 |
| commit | 159b028df58f480605b678109088e1b2ba8fdc71 (patch) | |
| tree | 6221bb93d3caaf1272ada437771fe4cfb41ef052 /libavcodec | |
| parent | d09254a658365b89fc4430e88e18fef04de432be (diff) | |
| download | ffmpeg-159b028df58f480605b678109088e1b2ba8fdc71.tar.gz | |
avcodec/h264_metadata_bsf: remove AUDs at any position
Some files, likely due to faulty packetization or muxing, can have AUDs
at other positions besides the head unit of a packet. Remove these too.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_metadata_bsf.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index d318bf0cee..b9cfeaba94 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -469,12 +469,13 @@ static int h264_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, H264MetadataContext *ctx = bsf->priv_data; int err, i, has_sps, seek_point; - // If an AUD is present, it must be the first NAL unit. - if (au->nb_units && au->units[0].type == H264_NAL_AUD) { - if (ctx->aud == BSF_ELEMENT_REMOVE) - ff_cbs_delete_unit(au, 0); - } else { - if (pkt && ctx->aud == BSF_ELEMENT_INSERT) { + if (ctx->aud == BSF_ELEMENT_REMOVE) { + for (i = au->nb_units - 1; i >= 0; i--) { + if (au->units[i].type == H264_NAL_AUD) + ff_cbs_delete_unit(au, i); + } + } else if (ctx->aud == BSF_ELEMENT_INSERT) { + if (pkt) { err = h264_metadata_insert_aud(bsf, au); if (err < 0) return err; |