Commit ef636aac authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit '018bdaed'

* commit '018bdaed':
  setpts: add FRAME_RATE constant
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 3ce3973e 018bdaed
...@@ -127,8 +127,9 @@ static int config_input(AVFilterLink *inlink) ...@@ -127,8 +127,9 @@ static int config_input(AVFilterLink *inlink)
setpts->var_values[VAR_SAMPLE_RATE] = setpts->var_values[VAR_SAMPLE_RATE] =
setpts->type == AVMEDIA_TYPE_AUDIO ? inlink->sample_rate : NAN; setpts->type == AVMEDIA_TYPE_AUDIO ? inlink->sample_rate : NAN;
setpts->var_values[VAR_FRAME_RATE] = inlink->frame_rate.num && inlink->frame_rate.den ? setpts->var_values[VAR_FRAME_RATE] = inlink->frame_rate.num &&
av_q2d(inlink->frame_rate) : NAN; 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", av_log(inlink->src, AV_LOG_VERBOSE, "TB:%f FRAME_RATE:%f SAMPLE_RATE:%f\n",
setpts->var_values[VAR_TB], setpts->var_values[VAR_TB],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment