Browse Source

avfilter/setpts: add FR shorthand for FRAME_RATE

tags/n4.1
Gyan Doshi 7 years ago
parent
commit
c71e1e6030
2 changed files with 5 additions and 2 deletions
  1. +1
    -1
      doc/filters.texi
  2. +4
    -1
      libavfilter/setpts.c

+ 1
- 1
doc/filters.texi View File

@@ -19392,7 +19392,7 @@ The expression is evaluated through the eval API and can contain the following
constants:

@table @option
@item FRAME_RATE
@item FRAME_RATE, FR
frame rate, only defined for constant frame-rate video

@item PTS


+ 4
- 1
libavfilter/setpts.c View File

@@ -57,6 +57,7 @@ static const char *const var_names[] = {
"RTCSTART", ///< wallclock (RTC) time at the start of the movie in micro seconds
"S", // Number of samples in the current frame
"SR", // Audio sample rate
"FR", ///< defined only for constant frame-rate video
NULL
};

@@ -81,6 +82,7 @@ enum var_name {
VAR_RTCSTART,
VAR_S,
VAR_SR,
VAR_FR,
VAR_VARS_NB
};

@@ -127,7 +129,8 @@ 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 &&
setpts->var_values[VAR_FRAME_RATE] =
setpts->var_values[VAR_FR] = inlink->frame_rate.num &&
inlink->frame_rate.den ?
av_q2d(inlink->frame_rate) : NAN;



Loading…
Cancel
Save