From ebd485db926889b5686cab440a6f514d6831209f Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 30 Aug 2020 05:49:46 +0200 Subject: [PATCH] avdevice/lavfi: Don't reimplement av_frame_get_side_data() Reviewed-by: Paul B Mahol Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 2a95cb013c..5e814eada8 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -362,16 +362,12 @@ static int create_subcc_packet(AVFormatContext *avctx, AVFrame *frame, { LavfiContext *lavfi = avctx->priv_data; AVFrameSideData *sd; - int stream_idx, i, ret; + int stream_idx, ret; if ((stream_idx = lavfi->sink_stream_subcc_map[sink_idx]) < 0) return 0; - for (i = 0; i < frame->nb_side_data; i++) - if (frame->side_data[i]->type == AV_FRAME_DATA_A53_CC) - break; - if (i >= frame->nb_side_data) + if (!(sd = av_frame_get_side_data(frame, AV_FRAME_DATA_A53_CC))) return 0; - sd = frame->side_data[i]; if ((ret = av_new_packet(&lavfi->subcc_packet, sd->size)) < 0) return ret; memcpy(lavfi->subcc_packet.data, sd->data, sd->size);