repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavfilter
/
af_afade.c
diff --git
a/ffmpeg/libavfilter/af_afade.c
b/ffmpeg/libavfilter/af_afade.c
index fbf9802127914bfc1d24c30731072d9de815151d..806f6f6145dd18493ab8da6cc2320c8025122060 100644
(file)
--- a/
ffmpeg/libavfilter/af_afade.c
+++ b/
ffmpeg/libavfilter/af_afade.c
@@
-230,7
+230,7
@@
static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
AVFilterLink *outlink = inlink->dst->outputs[0];
int nb_samples = buf->nb_samples;
AVFrame *out_buf;
AVFilterLink *outlink = inlink->dst->outputs[0];
int nb_samples = buf->nb_samples;
AVFrame *out_buf;
- int64_t cur_sample = av_rescale_q(buf->pts,
(AVRational){1, outlink->sample_rate}, outlink->time_base
);
+ int64_t cur_sample = av_rescale_q(buf->pts,
inlink->time_base, (AVRational){1, inlink->sample_rate}
);
if ((!s->type && (s->start_sample + s->nb_samples < cur_sample)) ||
( s->type && (cur_sample + s->nb_samples < s->start_sample)))
if ((!s->type && (s->start_sample + s->nb_samples < cur_sample)) ||
( s->type && (cur_sample + s->nb_samples < s->start_sample)))