diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-01 20:12:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-01 20:12:31 +0200 |
| commit | 046b5339fccebba331ce8fe28b53693c153831cd (patch) | |
| tree | 37a604cdeec3a86bbe601471e8cffda728d094c3 /libswresample/swresample.c | |
| parent | 30aa004f0cf0b5ef4c81853ce26af691f61e639a (diff) | |
| download | ffmpeg-046b5339fccebba331ce8fe28b53693c153831cd.tar.gz | |
swr: disable 1 stage convert when dither is enabled.
This combination is not possible easily.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.c')
| -rw-r--r-- | libswresample/swresample.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 7f545e0aee..9429c1ee45 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -274,7 +274,7 @@ av_assert0(s->out.ch_count); s->in_buffer= s->in; - if(!s->resample && !s->rematrix && !s->channel_map){ + if(!s->resample && !s->rematrix && !s->channel_map && !s->dither_method){ s->full_convert = swri_audio_convert_alloc(s->out_sample_fmt, s-> in_sample_fmt, s-> in.ch_count, NULL, 0); return 0; |