diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-08-21 19:17:24 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-09-12 18:51:46 +0200 |
| commit | 4381bddc9f93da34a44e683bdc4c05c6f061244e (patch) | |
| tree | 553faad5494c1b15bde6348ec79e83121baa1d3e /libavfilter/formats.c | |
| parent | 2c0317419bc8c7f28496d5181d951bbe8837071f (diff) | |
lavfi: consistently use int for sample_rate in AVFilterLink and AVFilterBufferRefAudioProps
Also consistent with AVCodecContext.sample_rate. Simplify/avoid
pointless type checks and conversions.
Breaks audio API/ABI.
Diffstat (limited to 'libavfilter/formats.c')
| -rw-r--r-- | libavfilter/formats.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 1959a0efcf..ef58665a17 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -266,11 +266,11 @@ int ff_parse_sample_format(int *ret, const char *arg, void *log_ctx) return 0; } -int ff_parse_sample_rate(unsigned *ret, const char *arg, void *log_ctx) +int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx) { char *tail; double srate = av_strtod(arg, &tail); - if (*tail || srate < 1 || (int)srate != srate) { + if (*tail || srate < 1 || (int)srate != srate || srate > INT_MAX) { av_log(log_ctx, AV_LOG_ERROR, "Invalid sample rate '%s'\n", arg); return AVERROR(EINVAL); } |