Merge commit '018bdaed37d2f1735dbecfc58309a1a164abadd5'

* commit '018bdaed37d2f1735dbecfc58309a1a164abadd5': setpts: add FRAME_RATE constant Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago · ef636aacf5
parent 3ce3973e5c 018bdaed37
commit ef636aacf5
1 changed files with 3 additions and 2 deletions
--- a/libavfilter/setpts.c
+++ b/libavfilter/setpts.c
@ -127,8 +127,9 @@ static int config_input(AVFilterLink *inlink)
    setpts->var_values[VAR_SAMPLE_RATE] =
        setpts->type == AVMEDIA_TYPE_AUDIO ? inlink->sample_rate : NAN;

-    setpts->var_values[VAR_FRAME_RATE] = inlink->frame_rate.num && inlink->frame_rate.den ?
-        av_q2d(inlink->frame_rate) : NAN;
+    setpts->var_values[VAR_FRAME_RATE] = inlink->frame_rate.num &&
+                                         inlink->frame_rate.den ?
+                                            av_q2d(inlink->frame_rate) : NAN;

    av_log(inlink->src, AV_LOG_VERBOSE, "TB:%f FRAME_RATE:%f SAMPLE_RATE:%f\n",
           setpts->var_values[VAR_TB],