diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-09-10 12:02:30 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-09-10 18:52:28 +0200 |
| commit | 206c34e17d7d8797811d9d48ef932db045649aa6 (patch) | |
| tree | 4dc561084121aa12e97322482dfb74388ce7512b | |
| parent | 722762f7e1212b4d02142778fabfdd73375722e0 (diff) | |
| download | ffmpeg-206c34e17d7d8797811d9d48ef932db045649aa6.tar.gz | |
lavfi/setpts: set SAMPLE_RATE to NAN when input is no audio
Should be more robust/consistent.
| -rw-r--r-- | libavfilter/f_setpts.c | 4 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/f_setpts.c b/libavfilter/f_setpts.c index 6227fe02a4..023dc1e672 100644 --- a/libavfilter/f_setpts.c +++ b/libavfilter/f_setpts.c @@ -106,8 +106,8 @@ static int config_input(AVFilterLink *inlink) setpts->type = inlink->type; setpts->var_values[VAR_TB] = av_q2d(inlink->time_base); - if (setpts->type == AVMEDIA_TYPE_AUDIO) - setpts->var_values[VAR_SAMPLE_RATE] = inlink->sample_rate; + 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; diff --git a/libavfilter/version.h b/libavfilter/version.h index 9d96d77cb1..5f642282b3 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MINOR 16 -#define LIBAVFILTER_VERSION_MICRO 102 +#define LIBAVFILTER_VERSION_MICRO 103 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |