[FFmpeg-cvslog] Merge commit '5b63b15663d31f50ce45d980b904a68795ad3f7a'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Oct  7 13:29:11 2016 +0200| [adfcf16f76de675f1dd313bc64ec52f2e143732b] | committer: Hendrik Leppkes

Merge commit '5b63b15663d31f50ce45d980b904a68795ad3f7a'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adfcf16f76de675f1dd313bc64ec52f2e143732b
---

 libavfilter/avfilter.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index b236535..1d469c3 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -316,14 +316,6 @@ int avfilter_config_links(AVFilterContext *filter)
                     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;
@@ -335,6 +327,14 @@ int avfilter_config_links(AVFilterContext *filter)
                 }
             }
 
+            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;
         }
     }


======================================================================

diff --cc libavfilter/avfilter.c
index b236535,1cedb15..1d469c3
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@@ -304,26 -209,8 +304,18 @@@ int avfilter_config_links(AVFilterConte
                             "width and height\n");
                      return AVERROR(EINVAL);
                  }
 +                break;
 +
 +            case AVMEDIA_TYPE_AUDIO:
 +                if (inlink) {
 +                    if (!link->time_base.num && !link->time_base.den)
 +                        link->time_base = inlink->time_base;
 +                }
 +
 +                if (!link->time_base.num && !link->time_base.den)
 +                    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;