RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
James Almer 2017-04-09 22:37:49 -03:00
parent f63c351657
commit 437ad467c2
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/mux.c
View File

@ -893,13 +893,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
for (i = 0; i < st->internal->nb_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
// flush each stream's BSF chain on write_trailer.
if ((ret = av_bsf_send_packet(ctx, pkt)) < 0) {
@ -919,12 +912,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
ctx->filter->name, pkt->stream_index);
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;
}