diff options
| author | Muhammad Faiz <mfcc64@gmail.com> | 2017-03-17 07:46:20 +0700 |
|---|---|---|
| committer | Muhammad Faiz <mfcc64@gmail.com> | 2017-03-17 09:59:44 +0700 |
| commit | 3ba7b47d5cb494a0559beb61156eceb17fabf91f (patch) | |
| tree | c2c79490301b9c017a47ef8da32756d6e0e47ae1 /libswresample | |
| parent | b4b8ca24f62473528949fe047085eb084364124b (diff) | |
| download | ffmpeg-3ba7b47d5cb494a0559beb61156eceb17fabf91f.tar.gz | |
swresample/resample: do not assert compensation_distance on rebuild_filter
when set_compensation is called with zero sample_delta,
compensation does not happen (because dst_incr == ideal_dst_incr)
but compensation_distance is set
regression since 01ebb57c03abde89bca7bdbc552917efcb8f551d
Found-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/resample.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswresample/resample.c b/libswresample/resample.c index 8f3428f512..144b232462 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -388,7 +388,7 @@ static int rebuild_filter_bank_with_compensation(ResampleContext *c) if (phase_count == c->phase_count) return 0; - av_assert0(!c->frac && !c->dst_incr_mod && !c->compensation_distance); + av_assert0(!c->frac && !c->dst_incr_mod); new_filter_bank = av_calloc(c->filter_alloc, (phase_count + 1) * c->felem_size); if (!new_filter_bank) |