History

avcodec/evc_frame_merge: reindent after previous commit

James Almer committed 3 years ago

Commit daf61a71 parent e6359b01 file · +15 −15Browse files

Unified · Split

libavcodec/evc_frame_merge_bsf.c+15−15
@@ -188,18 +188,18 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) · 187 unmodified lines
188188 au_end_found = err;
189189
190190 nalu_size += EVC_NALU_LENGTH_PREFIX_SIZE;
191− buffer = av_fast_realloc(ctx->au_buffer.data, &ctx->au_buffer.capacity,
192− ctx->au_buffer.data_size + nalu_size);
193− if (!buffer) {
194− av_freep(&ctx->au_buffer.data);
195− err = AVERROR_INVALIDDATA;
196− goto end;
197− }
191+ buffer = av_fast_realloc(ctx->au_buffer.data, &ctx->au_buffer.capacity,
192+ ctx->au_buffer.data_size + nalu_size);
193+ if (!buffer) {
194+ av_freep(&ctx->au_buffer.data);
195+ err = AVERROR_INVALIDDATA;
196+ goto end;
197+ }
198198
199− ctx->au_buffer.data = buffer;
200− memcpy(ctx->au_buffer.data + ctx->au_buffer.data_size, in->data, nalu_size);
199+ ctx->au_buffer.data = buffer;
200+ memcpy(ctx->au_buffer.data + ctx->au_buffer.data_size, in->data, nalu_size);
201201
202− ctx->au_buffer.data_size += nalu_size;
202+ ctx->au_buffer.data_size += nalu_size;
203203
204204 in->data += nalu_size;
205205 in->size -= nalu_size;
@@ -208,12 +208,12 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) · 2 unmodified lines
208208 av_packet_unref(in);
209209 data_size = ctx->au_buffer.data_size;
210210
211− ctx->au_buffer.data_size = 0;
212− err = av_new_packet(out, data_size);
213− if (err < 0)
214− goto end;
211+ ctx->au_buffer.data_size = 0;
212+ err = av_new_packet(out, data_size);
213+ if (err < 0)
214+ goto end;
215215
216− memcpy(out->data, ctx->au_buffer.data, data_size);
216+ memcpy(out->data, ctx->au_buffer.data, data_size);
217217
218218 err = 0;
219219 end:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t