mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/libvpxenc: Avoid one level of indentation
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:
parent
3280c6f938
commit
e099a29f5a
|
@ -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);
|
||||
uint8_t *side_data;
|
||||
if (ret >= 0) {
|
||||
int pict_type;
|
||||
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
memcpy(pkt->data, cx_frame->buf, pkt->size);
|
||||
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);
|
||||
|
||||
if (cx_frame->have_sse) {
|
||||
int i;
|
||||
/* 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];
|
||||
}
|
||||
cx_frame->have_sse = 0;
|
||||
}
|
||||
if (cx_frame->sz_alpha > 0) {
|
||||
side_data = av_packet_new_side_data(pkt,
|
||||
AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
|
||||
cx_frame->sz_alpha + 8);
|
||||
if(!side_data) {
|
||||
if (!side_data) {
|
||||
av_packet_unref(pkt);
|
||||
return AVERROR(ENOMEM);
|
||||
}
|
||||
AV_WB64(side_data, 1);
|
||||
memcpy(side_data + 8, cx_frame->buf_alpha, cx_frame->sz_alpha);
|
||||
}
|
||||
} else {
|
||||
return ret;
|
||||
}
|
||||
return pkt->size;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue