diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-02-16 11:26:32 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-02-20 20:46:35 +0100 |
| commit | 560b224f53fd553262790216d18c64665ebf436d (patch) | |
| tree | 74c87cf7cc43391b7517c001b980856a2ea95bbc /libswresample/swresample.c | |
| parent | 016c7bb762edded8d64f986e40b6f4cd739dd597 (diff) | |
| download | ffmpeg-560b224f53fd553262790216d18c64665ebf436d.tar.gz | |
libswr: allow to set custom matrices.
Diffstat (limited to 'libswresample/swresample.c')
| -rw-r--r-- | libswresample/swresample.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 84d0f40232..7fb1ee8c2c 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -209,7 +209,8 @@ int swr_init(struct SwrContext *s){ if(!s->out_ch_layout) s->out_ch_layout= av_get_default_channel_layout(s->out.ch_count); - s->rematrix= s->out_ch_layout !=s->in_ch_layout || s->rematrix_volume!=1.0; + s->rematrix= s->out_ch_layout !=s->in_ch_layout || s->rematrix_volume!=1.0 || + s->rematrix_custom; #define RSC 1 //FIXME finetune if(!s-> in.ch_count) |