diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-06-05 12:32:57 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-06-09 08:42:50 +0200 |
| commit | 7b42036b3b23c85f473bf9369e37fa8da22eaf93 (patch) | |
| tree | 0d9e90e6dfe9db20f9ea293abcab85e78f33b685 | |
| parent | 04e2ac47495e1910416e607eb03105ddb0a322cc (diff) | |
| download | ffmpeg-7b42036b3b23c85f473bf9369e37fa8da22eaf93.tar.gz | |
lavfi: add a frame_rate field to AVFilterLink.
| -rw-r--r-- | libavfilter/avfilter.c | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index fb74f26dc2..dfa2d2b220 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -243,6 +243,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->w) link->w = inlink->w; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 17c074fd25..955550eb1e 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -738,6 +738,18 @@ 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 + * of the source filter if it exists. + * + * Sources should set it to the best estimation of the real frame rate. + * 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_frae_rate field in AVStream. + */ + AVRational frame_rate; + }; /** |