Merge commit '5b63b15663d31f50ce45d980b904a68795ad3f7a'

* commit '5b63b15663d31f50ce45d980b904a68795ad3f7a': lavfi: set the link hwframes context before configuring the dst input

Hendrik Leppkes committed 10 years ago

Commit adfcf162 parents 85146df 5b63b151 file · +8 −8Browse files

Showing the changes to libavfilter/avfilter.c (1 of 1 file). Show all

Unified · Split

                     link->time_base = (AVRational) {1, link->sample_rate};
             }
-            if ((config_link = link->dstpad->config_props))
-                if ((ret = config_link(link)) < 0) {
-                    av_log(link->dst, AV_LOG_ERROR,
-                           "Failed to configure input pad on %s\n",
-                           link->dst->name);
-                    return ret;
-                }
             if (link->src->nb_inputs && link->src->inputs[0]->hw_frames_ctx &&
                 !link->hw_frames_ctx) {
                 AVHWFramesContext *input_ctx = (AVHWFramesContext*)link->src->inputs[0]->hw_frames_ctx->data;
                 }
             }
+            if ((config_link = link->dstpad->config_props))
+                if ((ret = config_link(link)) < 0) {
+                    av_log(link->dst, AV_LOG_ERROR,
+                           "Failed to configure input pad on %s\n",
+                           link->dst->name);
+                    return ret;
+                }
             link->init_state = AVLINK_INIT;
         }
     }

Keyboard shortcuts