[FFmpeg-cvslog] fftools/ffmpeg: do not use the encoder context for streamcopy
Anton Khirnov
git at videolan.org
Thu Jul 28 18:01:46 EEST 2022
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Jun 19 15:05:20 2022 +0200| [1eae0ee02ee74dc1833e9610a1574fe25cc7a2f0] | committer: Anton Khirnov
fftools/ffmpeg: do not use the encoder context for streamcopy
The streamcopy initialization code briefly needs an AVCodecContext to
apply AVOptions to. Allocate a temporary codec context, do not use the
encoding one.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1eae0ee02ee74dc1833e9610a1574fe25cc7a2f0
---
fftools/ffmpeg.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index ab2841f3d4..f98150660c 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2757,22 +2757,29 @@ static int init_output_stream_streamcopy(OutputStream *ost)
OutputFile *of = output_files[ost->file_index];
InputStream *ist = get_input_stream(ost);
AVCodecParameters *par = ost->st->codecpar;
+ AVCodecContext *codec_ctx;
AVRational sar;
int i, ret;
uint32_t codec_tag = par->codec_tag;
av_assert0(ist && !ost->filter);
- ret = avcodec_parameters_to_context(ost->enc_ctx, ist->st->codecpar);
+ codec_ctx = avcodec_alloc_context3(NULL);
+ if (!codec_ctx)
+ return AVERROR(ENOMEM);
+
+ ret = avcodec_parameters_to_context(codec_ctx, ist->st->codecpar);
if (ret >= 0)
- ret = av_opt_set_dict(ost->enc_ctx, &ost->encoder_opts);
+ ret = av_opt_set_dict(codec_ctx, &ost->encoder_opts);
if (ret < 0) {
av_log(NULL, AV_LOG_FATAL,
"Error setting up codec context options.\n");
+ avcodec_free_context(&codec_ctx);
return ret;
}
- ret = avcodec_parameters_from_context(par, ost->enc_ctx);
+ ret = avcodec_parameters_from_context(par, codec_ctx);
+ avcodec_free_context(&codec_ctx);
if (ret < 0) {
av_log(NULL, AV_LOG_FATAL,
"Error getting reference codec parameters.\n");
More information about the ffmpeg-cvslog
mailing list