breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '48ff6683ba5d40b629428673b1028e8ec542a9fa'

Browse Source 
* 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
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)