summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-04-09 22:37:49 -0300
committerJames Almer <jamrial@gmail.com>2017-05-24 20:28:00 -0300
commit437ad467c250f8b96dc3456997906866d748f6ba (patch)
tree6cc6eedcd6cf42f8aa3c7eab7f9acf017d6647b0 /libavformat
parentf63c3516577d605e51cf16358cbdfa0bc97565d8 (diff)
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>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mux.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 039d992e8c..01dcb362ae 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -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;
}