RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f0e959481968b6d906931127237ed981b6414f6e' 

* commit 'f0e959481968b6d906931127237ed981b6414f6e':
  af_channelmap: Set the frame channel layout

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-02 04:46:36 +02:00
parent dcd984e24d f0e9594819
commit e85bc9df87
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/af_channelmap.c
View File

@ -338,6 +338,8 @@ static int channelmap_filter_frame(AVFilterLink *inlink, AVFrame *buf)
memcpy(buf->data, buf->extended_data, memcpy(buf->data, buf->extended_data,
FFMIN(FF_ARRAY_ELEMS(buf->data), nch_out) * sizeof(buf->data[0])); FFMIN(FF_ARRAY_ELEMS(buf->data), nch_out) * sizeof(buf->data[0]));
buf->channel_layout = outlink->channel_layout;
return ff_filter_frame(outlink, buf); return ff_filter_frame(outlink, buf);
} }