aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2014-08-01 22:27:13 +0200
committerLuca Barbato <lu_zero@gentoo.org>2014-08-02 00:58:21 +0200
commit87efaa97ceb0ad5820870855d6df3e569e6eac7e (patch)
treec0f3938ce89625fbd316424143ca2f5c29a9518a
parentfa14804c83a7108a50c63d1f2180e30c75909529 (diff)
downloadffmpeg-87efaa97ceb0ad5820870855d6df3e569e6eac7e.tar.gz
af_join: Set the output frame format
-rw-r--r--libavfilter/af_join.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index ee87340603..e684cb9ff9 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -480,6 +480,7 @@ static int join_request_frame(AVFilterLink *outlink)
frame->nb_samples = nb_samples;
frame->channel_layout = outlink->channel_layout;
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) {