mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/mux: remove autobsf extradata propagation hack
The offending bitstream filter was fixed, so this is no longer needed. Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
f63c351657
commit
437ad467c2
|
@ -893,13 +893,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||||
|
|
||||||
for (i = 0; i < st->internal->nb_bsfcs; i++) {
|
for (i = 0; i < st->internal->nb_bsfcs; i++) {
|
||||||
AVBSFContext *ctx = st->internal->bsfcs[i];
|
AVBSFContext *ctx = st->internal->bsfcs[i];
|
||||||
if (i > 0) {
|
|
||||||
AVBSFContext* prev_ctx = st->internal->bsfcs[i - 1];
|
|
||||||
if (prev_ctx->par_out->extradata_size != ctx->par_in->extradata_size) {
|
|
||||||
if ((ret = avcodec_parameters_copy(ctx->par_in, prev_ctx->par_out)) < 0)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// TODO: when any bitstream filter requires flushing at EOF, we'll need to
|
// TODO: when any bitstream filter requires flushing at EOF, we'll need to
|
||||||
// flush each stream's BSF chain on write_trailer.
|
// flush each stream's BSF chain on write_trailer.
|
||||||
if ((ret = av_bsf_send_packet(ctx, pkt)) < 0) {
|
if ((ret = av_bsf_send_packet(ctx, pkt)) < 0) {
|
||||||
|
@ -919,12 +912,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||||
ctx->filter->name, pkt->stream_index);
|
ctx->filter->name, pkt->stream_index);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
if (i == st->internal->nb_bsfcs - 1) {
|
|
||||||
if (ctx->par_out->extradata_size != st->codecpar->extradata_size) {
|
|
||||||
if ((ret = avcodec_parameters_copy(st->codecpar, ctx->par_out)) < 0)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue