diff options
| author | James Almer <jamrial@gmail.com> | 2018-09-12 15:21:09 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-10-27 00:02:13 -0300 |
| commit | cacb62f9cbf37bb05b00a025b21904b6966b6a49 (patch) | |
| tree | 02e43de88a66c977673ec8163d5be9037756effc | |
| parent | 1ff6cb2ca6652e7d2a929afd33d8ed6268c45568 (diff) | |
| download | ffmpeg-cacb62f9cbf37bb05b00a025b21904b6966b6a49.tar.gz | |
Revert "decode: copy the output parameters from the last bsf in the chain back to the AVCodecContext"
This reverts commit 662558f985f50834eebe82d6b6854c66f33ab320.
The avcodec_parameters_to_context() call was freeing and reallocating
AVCodecContext->extradata, essentially taking ownership of it, which according
to the doxy is user owned. This is an API break and has produces crashes in
some library users like Firefox.
Revert until a better solution is found to internally propagate the filtered
extradata back into the decoder context.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/decode.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index d10a2c8b58..2dab7f2a71 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -221,10 +221,6 @@ int ff_decode_bsfs_init(AVCodecContext *avctx) goto fail; } - ret = avcodec_parameters_to_context(avctx, s->bsfs[s->nb_bsfs - 1]->par_out); - if (ret < 0) - return ret; - return 0; fail: ff_decode_bsfs_uninit(avctx); |