avconv: pass the hw context from filters to the encoder
authorAnton Khirnov <anton@khirnov.net>
Tue, 2 Feb 2016 09:38:58 +0000 (10:38 +0100)
committerAnton Khirnov <anton@khirnov.net>
Sun, 14 Feb 2016 21:33:26 +0000 (22:33 +0100)
avconv.c

index 6b37d6e..a84a345 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -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);