diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 14:56:32 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 14:56:53 +0100 |
| commit | ef636aacf54ece8d596fa84f4d66beb2ab814080 (patch) | |
| tree | c4ba19aebbdd91f2ead59f6e143281f134ec5e8d /libavfilter | |
| parent | 3ce3973e5c2659e122465ec2e5a2debc8272c14d (diff) | |
| parent | 018bdaed37d2f1735dbecfc58309a1a164abadd5 (diff) | |
| download | ffmpeg-ef636aacf54ece8d596fa84f4d66beb2ab814080.tar.gz | |
Merge commit '018bdaed37d2f1735dbecfc58309a1a164abadd5'
* commit '018bdaed37d2f1735dbecfc58309a1a164abadd5':
setpts: add FRAME_RATE constant
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/setpts.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index dbfd88d218..2ccca28e9a 100644 --- 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], |