diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-02 04:46:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-02 04:47:31 +0200 |
| commit | e85bc9df87a1b308b259f856325fcbe73d7a40cc (patch) | |
| tree | 4d99809b6620f96981c7ed75dea9982470872e65 /libavfilter/af_channelmap.c | |
| parent | dcd984e24d0a1fb5616a5f4629a1328436d2ba7d (diff) | |
| parent | f0e959481968b6d906931127237ed981b6414f6e (diff) | |
| download | ffmpeg-e85bc9df87a1b308b259f856325fcbe73d7a40cc.tar.gz | |
Merge commit 'f0e959481968b6d906931127237ed981b6414f6e'
* commit 'f0e959481968b6d906931127237ed981b6414f6e':
af_channelmap: Set the frame channel layout
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_channelmap.c')
| -rw-r--r-- | libavfilter/af_channelmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index b3b5aca029..0bf2fe92c0 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -338,6 +338,8 @@ static int channelmap_filter_frame(AVFilterLink *inlink, AVFrame *buf) memcpy(buf->data, buf->extended_data, FFMIN(FF_ARRAY_ELEMS(buf->data), nch_out) * sizeof(buf->data[0])); + buf->channel_layout = outlink->channel_layout; + return ff_filter_frame(outlink, buf); } |