highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/libvpxenc: Avoid one level of indentation

Browse Source 
Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-04-28 00:06:36 +02:00
parent 3280c6f938
commit e099a29f5a
1 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/libvpxenc.c
View File

@@ -1176,8 +1176,11 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame,
{ {
int ret = ff_get_encode_buffer(avctx, pkt, cx_frame->sz, 0); int ret = ff_get_encode_buffer(avctx, pkt, cx_frame->sz, 0);
uint8_t *side_data; uint8_t *side_data;
if (ret >= 0) {
int pict_type; int pict_type;
if (ret < 0)
return ret;
memcpy(pkt->data, cx_frame->buf, pkt->size); memcpy(pkt->data, cx_frame->buf, pkt->size);
pkt->pts = pkt->dts = cx_frame->pts; pkt->pts = pkt->dts = cx_frame->pts;
@@ -1192,27 +1195,22 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame,
cx_frame->have_sse ? 3 : 0, pict_type); cx_frame->have_sse ? 3 : 0, pict_type);
if (cx_frame->have_sse) { if (cx_frame->have_sse) {
int i;
/* Beware of the Y/U/V/all order! */ /* Beware of the Y/U/V/all order! */
for (i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i)
avctx->error[i] += cx_frame->sse[i + 1]; avctx->error[i] += cx_frame->sse[i + 1];
}
cx_frame->have_sse = 0; cx_frame->have_sse = 0;
} }
if (cx_frame->sz_alpha > 0) { if (cx_frame->sz_alpha > 0) {
side_data = av_packet_new_side_data(pkt, side_data = av_packet_new_side_data(pkt,
AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
cx_frame->sz_alpha + 8); cx_frame->sz_alpha + 8);
if(!side_data) { if (!side_data) {
av_packet_unref(pkt); av_packet_unref(pkt);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
AV_WB64(side_data, 1); AV_WB64(side_data, 1);
memcpy(side_data + 8, cx_frame->buf_alpha, cx_frame->sz_alpha); memcpy(side_data + 8, cx_frame->buf_alpha, cx_frame->sz_alpha);
} }
} else {
return ret;
}
return pkt->size; return pkt->size;
} }