RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '48ff6683ba5d40b629428673b1028e8ec542a9fa' 

* commit '48ff6683ba5d40b629428673b1028e8ec542a9fa':
  lavfi: add a frame_rate field to AVFilterLink.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-11-11 14:45:24 +01:00
parent b33d58c31f 48ff6683ba
commit 0b73d0ff0d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/avfilter.c
View File

@ -275,10 +275,9 @@ int avfilter_config_links(AVFilterContext *filter)
link->sample_aspect_ratio = inlink ?
inlink->sample_aspect_ratio : (AVRational){1,1};
if (inlink && !link->frame_rate.num && !link->frame_rate.den)
link->frame_rate = inlink->frame_rate;
if (inlink) {
if (!link->frame_rate.num && !link->frame_rate.den)
link->frame_rate = inlink->frame_rate;
if (!link->w)
link->w = inlink->w;
if (!link->h)

5
libavfilter/avfilter.h
View File

@ -445,11 +445,12 @@ struct AVFilterLink {
int age_index;
/**
* Frame rate of the stream on the link, or 1/0 if unknown;
* if left to 0/0, will be automatically be copied from the first input
* Frame rate of the stream on the link, or 1/0 if unknown or variable;
* if left to 0/0, will be automatically copied from the first input
* of the source filter if it exists.
*
* Sources should set it to the best estimation of the real frame rate.
* If the source frame rate is unknown or variable, set this to 1/0.
* Filters should update it if necessary depending on their function.
* Sinks can use it to set a default output frame rate.
* It is similar to the r_frame_rate field in AVStream.