[FFmpeg-cvslog] avfilter/setpts: add FR shorthand for FRAME_RATE

[Gyan Doshi]

ffmpeg | branch: master | Gyan Doshi <ffmpeg at gyani.pro> | Thu Jul  5 15:42:55 2018 +0530| [c71e1e60305669c225c696dd99f6db5dc550a56a] | committer: Gyan Doshi

avfilter/setpts: add FR shorthand for FRAME_RATE

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

 doc/filters.texi     | 2 +-
 libavfilter/setpts.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 3e668703ae..d236bd69b7 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -19392,7 +19392,7 @@ The expression is evaluated through the eval API and can contain the following
 constants:
 
 @table @option
- at item FRAME_RATE
+ at item FRAME_RATE, FR
 frame rate, only defined for constant frame-rate video
 
 @item PTS
diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c
index 4505498bf3..800ba6a83f 100644
--- a/libavfilter/setpts.c
+++ b/libavfilter/setpts.c
@@ -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;