diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 21:44:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 21:46:00 +0100 |
| commit | fc10ed2cac71d8bcda80afdb8f1a3112b854fbd5 (patch) | |
| tree | 145e2995812b5f70c17cc3aaa656be2416d3e211 | |
| parent | 70a25587d22384bca8f102d68f5b65ebf3e421b2 (diff) | |
| parent | dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d (diff) | |
| download | ffmpeg-fc10ed2cac71d8bcda80afdb8f1a3112b854fbd5.tar.gz | |
Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'
* commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d':
af_resample: preserve frame properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/af_resample.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c index bf32aa73b1..9d1b1c4567 100644 --- a/libavfilter/af_resample.c +++ b/libavfilter/af_resample.c @@ -251,6 +251,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) if (ret > 0) { out->nb_samples = ret; + + ret = av_frame_copy_props(out, in); + if (ret < 0) { + av_frame_free(&out); + goto fail; + } + + out->sample_rate = outlink->sample_rate; if (in->pts != AV_NOPTS_VALUE) { out->pts = av_rescale_q(in->pts, inlink->time_base, outlink->time_base) - |