OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
67f2a68
)
af_resample: preserve frame properties
author
Anton Khirnov
<anton@khirnov.net>
Wed, 19 Feb 2014 19:42:39 +0000
(20:42 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Mon, 24 Feb 2014 16:30:48 +0000
(17:30 +0100)
libavfilter/af_resample.c
patch
|
blob
|
history
diff --git
a/libavfilter/af_resample.c
b/libavfilter/af_resample.c
index
224e0ed
..
a89ab35
100644
(file)
--- a/
libavfilter/af_resample.c
+++ b/
libavfilter/af_resample.c
@@
-252,6
+252,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) -