From: James Almer <jamrial@gmail.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/evc_frame_merge: reindent after previous commit Date: Wed, 21 Jun 2023 13:59:48 -0300 Message-ID: <20230621165949.1112-2-jamrial@gmail.com> (raw) In-Reply-To: <20230621165949.1112-1-jamrial@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/evc_frame_merge_bsf.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/evc_frame_merge_bsf.c index 8af6095bf1..36ffec5736 100644 --- a/libavcodec/evc_frame_merge_bsf.c +++ b/libavcodec/evc_frame_merge_bsf.c @@ -188,18 +188,18 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) au_end_found = err; nalu_size += EVC_NALU_LENGTH_PREFIX_SIZE; - buffer = av_fast_realloc(ctx->au_buffer.data, &ctx->au_buffer.capacity, - ctx->au_buffer.data_size + nalu_size); - if (!buffer) { - av_freep(&ctx->au_buffer.data); - err = AVERROR_INVALIDDATA; - goto end; - } + buffer = av_fast_realloc(ctx->au_buffer.data, &ctx->au_buffer.capacity, + ctx->au_buffer.data_size + nalu_size); + if (!buffer) { + av_freep(&ctx->au_buffer.data); + err = AVERROR_INVALIDDATA; + goto end; + } - ctx->au_buffer.data = buffer; - memcpy(ctx->au_buffer.data + ctx->au_buffer.data_size, in->data, nalu_size); + ctx->au_buffer.data = buffer; + memcpy(ctx->au_buffer.data + ctx->au_buffer.data_size, in->data, nalu_size); - ctx->au_buffer.data_size += nalu_size; + ctx->au_buffer.data_size += nalu_size; in->data += nalu_size; in->size -= nalu_size; @@ -208,12 +208,12 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) av_packet_unref(in); data_size = ctx->au_buffer.data_size; - ctx->au_buffer.data_size = 0; - err = av_new_packet(out, data_size); - if (err < 0) - goto end; + ctx->au_buffer.data_size = 0; + err = av_new_packet(out, data_size); + if (err < 0) + goto end; - memcpy(out->data, ctx->au_buffer.data, data_size); + memcpy(out->data, ctx->au_buffer.data, data_size); err = 0; end: -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-06-21 17:00 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-06-21 16:59 [FFmpeg-devel] [PATCH 1/3] avcodec/evc_frame_merge: properly support packets with more than one NALU James Almer 2023-06-21 16:59 ` James Almer [this message] 2023-06-21 16:59 ` [FFmpeg-devel] [PATCH 3/3] avcodec/evc_frame_merge: copy input packet props to output James Almer 2023-06-22 17:25 ` [FFmpeg-devel] [PATCH 1/3] avcodec/evc_frame_merge: properly support packets with more than one NALU James Almer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230621165949.1112-2-jamrial@gmail.com \ --to=jamrial@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git