projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fa14804
)
af_join: Set the output frame format
author
Luca Barbato
<lu_zero@gentoo.org>
Fri, 1 Aug 2014 20:27:13 +0000
(22:27 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Fri, 1 Aug 2014 22:58:21 +0000
(
00:58
+0200)
libavfilter/af_join.c
patch
|
blob
|
history
diff --git
a/libavfilter/af_join.c
b/libavfilter/af_join.c
index
ee87340
..
e684cb9
100644
(file)
--- 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) {