diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-02 04:37:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-02 04:45:26 +0200 |
| commit | dcd984e24d0a1fb5616a5f4629a1328436d2ba7d (patch) | |
| tree | f96bf0e71bd4b897b2b564d7ddb93b81b207d1f0 /libavfilter | |
| parent | 98e42a249e7891d295228ff19892450ba1f09092 (diff) | |
| parent | 87efaa97ceb0ad5820870855d6df3e569e6eac7e (diff) | |
| download | ffmpeg-dcd984e24d0a1fb5616a5f4629a1328436d2ba7d.tar.gz | |
Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'
* commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e':
af_join: Set the output frame format
See: e0dd8cadcc386a168e7acd079463880154086446
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_join.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index 3e9ccc8d74..560c5c82dc 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -470,8 +470,8 @@ static int join_request_frame(AVFilterLink *outlink) frame->nb_samples = nb_samples; frame->channel_layout = outlink->channel_layout; av_frame_set_channels(frame, outlink->channels); - frame->format = outlink->format; frame->sample_rate = outlink->sample_rate; + frame->format = outlink->format; frame->pts = s->input_frames[0]->pts; frame->linesize[0] = linesize; if (frame->data != frame->extended_data) { |