Unified · Split
| @@ -188,18 +188,18 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) · 187 unmodified lines | |||
| 188 | au_end_found = err; | 188 | au_end_found = err; |
| 189 | 189 | ||
| 190 | nalu_size += EVC_NALU_LENGTH_PREFIX_SIZE; | 190 | nalu_size += EVC_NALU_LENGTH_PREFIX_SIZE; |
| 191 | buffer = av_fast_realloc(ctx->au_buffer.data, &ctx->au_buffer.capacity, | 191 | buffer = av_fast_realloc(ctx->au_buffer.data, &ctx->au_buffer.capacity, |
| 192 | ctx->au_buffer.data_size + nalu_size); | 192 | ctx->au_buffer.data_size + nalu_size); |
| 193 | if (!buffer) { | 193 | if (!buffer) { |
| 194 | av_freep(&ctx->au_buffer.data); | 194 | av_freep(&ctx->au_buffer.data); |
| 195 | err = AVERROR_INVALIDDATA; | 195 | err = AVERROR_INVALIDDATA; |
| 196 | goto end; | 196 | goto end; |
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | ctx->au_buffer.data = buffer; | 199 | ctx->au_buffer.data = buffer; |
| 200 | memcpy(ctx->au_buffer.data + ctx->au_buffer.data_size, in->data, nalu_size); | 200 | memcpy(ctx->au_buffer.data + ctx->au_buffer.data_size, in->data, nalu_size); |
| 201 | 201 | ||
| 202 | ctx->au_buffer.data_size += nalu_size; | 202 | ctx->au_buffer.data_size += nalu_size; |
| 203 | 203 | ||
| 204 | in->data += nalu_size; | 204 | in->data += nalu_size; |
| 205 | in->size -= nalu_size; | 205 | in->size -= nalu_size; |
| @@ -208,12 +208,12 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) · 2 unmodified lines | |||
| 208 | av_packet_unref(in); | 208 | av_packet_unref(in); |
| 209 | data_size = ctx->au_buffer.data_size; | 209 | data_size = ctx->au_buffer.data_size; |
| 210 | 210 | ||
| 211 | ctx->au_buffer.data_size = 0; | 211 | ctx->au_buffer.data_size = 0; |
| 212 | err = av_new_packet(out, data_size); | 212 | err = av_new_packet(out, data_size); |
| 213 | if (err < 0) | 213 | if (err < 0) |
| 214 | goto end; | 214 | goto end; |
| 215 | 215 | ||
| 216 | memcpy(out->data, ctx->au_buffer.data, data_size); | 216 | memcpy(out->data, ctx->au_buffer.data, data_size); |
| 217 | 217 | ||
| 218 | err = 0; | 218 | err = 0; |
| 219 | end: | 219 | end: |