highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi: add a frame_rate field to AVFilterLink.

Browse Source 
(cherry picked from ffmpeg commit 7b42036b3b)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Nicolas George
2015-11-03 09:57:17 -08:00
committed by Anton Khirnov
parent 79f5347a98
commit 48ff6683ba
4 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -12,6 +12,9 @@ libavutil: 2015-08-28
API changes, most recent first: API changes, most recent first:
2015-11-xx - xxxxxxx - lavfi 6.1.0 - avfilter.h
Add a frame_rate field to AVFilterLink
2015-xx-xx - xxxxxxx - lavc 57.6.0 - avcodec.h 2015-xx-xx - xxxxxxx - lavc 57.6.0 - avcodec.h
2015-xx-xx - lavc 57.7.0 - avcodec.h 2015-xx-xx - lavc 57.7.0 - avcodec.h

2
libavfilter/avfilter.c
View File

@ -195,6 +195,8 @@ int avfilter_config_links(AVFilterContext *filter)
link->src->inputs[0]->sample_aspect_ratio : (AVRational){1,1}; link->src->inputs[0]->sample_aspect_ratio : (AVRational){1,1};
if (link->src->nb_inputs) { if (link->src->nb_inputs) {
if (!link->frame_rate.num && !link->frame_rate.den)
link->frame_rate = link->src->inputs[0]->frame_rate;
if (!link->w) if (!link->w)
link->w = link->src->inputs[0]->w; link->w = link->src->inputs[0]->w;
if (!link->h) if (!link->h)

12
libavfilter/avfilter.h
View File

@ -375,6 +375,18 @@ struct AVFilterLink {
AVLINK_STARTINIT, ///< started, but incomplete AVLINK_STARTINIT, ///< started, but incomplete
AVLINK_INIT ///< complete AVLINK_INIT ///< complete
} init_state; } init_state;
/**
* 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 real constant 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.
*/
AVRational frame_rate;
}; };
/** /**

2
libavfilter/version.h
View File

@ -30,7 +30,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVFILTER_VERSION_MAJOR 6 #define LIBAVFILTER_VERSION_MAJOR 6
#define LIBAVFILTER_VERSION_MINOR 0 #define LIBAVFILTER_VERSION_MINOR 1
#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \