diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-15 20:55:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-15 20:56:06 +0200 |
| commit | 90d8506fbf1b5d9bd6ed1f01a8610df01771e3c3 (patch) | |
| tree | 36f219ad7d67eca3542a179e6eb0d84fcf3367e4 /libavfilter | |
| parent | be32145e9da7b8a7150011ba98bf411fd720c060 (diff) | |
| parent | fbc57405664876cb7f47f1ac264db16a3014e665 (diff) | |
| download | ffmpeg-90d8506fbf1b5d9bd6ed1f01a8610df01771e3c3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
af_resample: fix format modifier in debug string for FF_API_SAMPLERATE64
segment: remove unnecessary <strings.h> include
fate: add snow hpel tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_resample.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c index 8a02cfe976..bc4a0073a1 100644 --- a/libavfilter/af_resample.c +++ b/libavfilter/af_resample.c @@ -119,7 +119,11 @@ static int config_output(AVFilterLink *outlink) av_get_channel_layout_string(buf2, sizeof(buf2), -1, outlink->channel_layout); av_log(ctx, AV_LOG_VERBOSE, +#if FF_API_SAMPLERATE64 + "fmt:%s srate:%"PRId64" cl:%s -> fmt:%s srate:%"PRId64" cl:%s\n", +#else "fmt:%s srate:%d cl:%s -> fmt:%s srate:%d cl:%s\n", +#endif /* FF_API_SAMPLERATE64 */ av_get_sample_fmt_name(inlink ->format), inlink ->sample_rate, buf1, av_get_sample_fmt_name(outlink->format), outlink->sample_rate, buf2); |