Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/libx26[45]: reindent after last commit

Browse Source 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
remotes/origin/release/5.0
Limin Wang 3 years ago
parent 7dfc3cc713
commit 63d5b6f935
2 changed files with 46 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      libavcodec/libx264.c
  2. 48
      libavcodec/libx265.c

44
libavcodec/libx264.c
Unescape View File

@ -466,29 +466,29 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,
} }
if (x4->udu_sei) { if (x4->udu_sei) {
for (int j = 0; j < frame->nb_side_data; j++) { for (int j = 0; j < frame->nb_side_data; j++) {
AVFrameSideData *side_data = frame->side_data[j]; AVFrameSideData *side_data = frame->side_data[j];
void *tmp; void *tmp;
x264_sei_payload_t *sei_payload; x264_sei_payload_t *sei_payload;
if (side_data->type != AV_FRAME_DATA_SEI_UNREGISTERED) if (side_data->type != AV_FRAME_DATA_SEI_UNREGISTERED)
continue; continue;
tmp = av_fast_realloc(sei->payloads, &sei_data_size, (sei->num_payloads + 1) * sizeof(*sei_payload)); tmp = av_fast_realloc(sei->payloads, &sei_data_size, (sei->num_payloads + 1) * sizeof(*sei_payload));
if (!tmp) { if (!tmp) {
free_picture(ctx); free_picture(ctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
sei->payloads = tmp; sei->payloads = tmp;
sei->sei_free = av_free; sei->sei_free = av_free;
sei_payload = &sei->payloads[sei->num_payloads]; sei_payload = &sei->payloads[sei->num_payloads];
sei_payload->payload = av_memdup(side_data->data, side_data->size); sei_payload->payload = av_memdup(side_data->data, side_data->size);
if (!sei_payload->payload) { if (!sei_payload->payload) {
free_picture(ctx); free_picture(ctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
sei_payload->payload_size = side_data->size;
sei_payload->payload_type = SEI_TYPE_USER_DATA_UNREGISTERED;
sei->num_payloads++;
} }
sei_payload->payload_size = side_data->size;
sei_payload->payload_type = SEI_TYPE_USER_DATA_UNREGISTERED;
sei->num_payloads++;
}
} }
} }

48
libavcodec/libx265.c
Unescape View File

@ -545,31 +545,31 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
} }
if (ctx->udu_sei) { if (ctx->udu_sei) {
for (i = 0; i < pic->nb_side_data; i++) { for (i = 0; i < pic->nb_side_data; i++) {
AVFrameSideData *side_data = pic->side_data[i]; AVFrameSideData *side_data = pic->side_data[i];
void *tmp; void *tmp;
x265_sei_payload *sei_payload; x265_sei_payload *sei_payload;
if (side_data->type != AV_FRAME_DATA_SEI_UNREGISTERED) if (side_data->type != AV_FRAME_DATA_SEI_UNREGISTERED)
continue; continue;
tmp = av_fast_realloc(ctx->sei_data, tmp = av_fast_realloc(ctx->sei_data,
&ctx->sei_data_size, &ctx->sei_data_size,
(sei->numPayloads + 1) * sizeof(*sei_payload)); (sei->numPayloads + 1) * sizeof(*sei_payload));
if (!tmp) { if (!tmp) {
av_freep(&x265pic.userData); av_freep(&x265pic.userData);
av_freep(&x265pic.quantOffsets); av_freep(&x265pic.quantOffsets);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
ctx->sei_data = tmp;
sei->payloads = ctx->sei_data;
sei_payload = &sei->payloads[sei->numPayloads];
sei_payload->payload = side_data->data;
sei_payload->payloadSize = side_data->size;
/* Equal to libx265 USER_DATA_UNREGISTERED */
sei_payload->payloadType = SEI_TYPE_USER_DATA_UNREGISTERED;
sei->numPayloads++;
} }
ctx->sei_data = tmp;
sei->payloads = ctx->sei_data;
sei_payload = &sei->payloads[sei->numPayloads];
sei_payload->payload = side_data->data;
sei_payload->payloadSize = side_data->size;
/* Equal to libx265 USER_DATA_UNREGISTERED */
sei_payload->payloadType = SEI_TYPE_USER_DATA_UNREGISTERED;
sei->numPayloads++;
}
} }
} }

Write Preview
Loading…
Cancel
Save