diff options
author | Anton Khirnov <anton@khirnov.net> | 2016-02-02 10:38:58 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2016-02-14 22:33:26 +0100 |
commit | c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1 (patch) | |
tree | 163e1ad4e9243a475ec0b0f97c0938c4ef0fec16 | |
parent | 871d0930d4c8666df5514093beff874acbe5cce0 (diff) | |
download | ffmpeg-c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1.tar.gz |
avconv: pass the hw context from filters to the encoder
-rw-r--r-- | avconv.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1581,6 +1581,12 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len) if (!av_dict_get(ost->encoder_opts, "threads", NULL, 0)) av_dict_set(&ost->encoder_opts, "threads", "auto", 0); + if (ost->filter && ost->filter->filter->inputs[0]->hw_frames_ctx) { + ost->enc_ctx->hw_frames_ctx = av_buffer_ref(ost->filter->filter->inputs[0]->hw_frames_ctx); + if (!ost->enc_ctx->hw_frames_ctx) + return AVERROR(ENOMEM); + } + if ((ret = avcodec_open2(ost->enc_ctx, codec, &ost->encoder_opts)) < 0) { if (ret == AVERROR_EXPERIMENTAL) abort_codec_experimental(codec, 1); |