diff options
| author | Jan Holthuis <jholthuis@mixxx.org> | 2021-07-21 15:38:38 +0200 |
|---|---|---|
| committer | Jan Holthuis <jholthuis@mixxx.org> | 2021-07-21 15:38:38 +0200 |
| commit | ffcca0193fdf50f42a352be491c16d7c1d8b8146 (patch) | |
| tree | cda7d13aa2ed17401c09a25151d986015b76e6bb /src/sources | |
| parent | ac7daeb08ffd7baa4dcb0e470c292f69cd96e0a1 (diff) | |
| parent | 2a5b95eca405b9a71b8160c569faa413c6434ed9 (diff) | |
Merge branch '2.3' of github.com:mixxxdj/mixxx
Diffstat (limited to 'src/sources')
| -rw-r--r-- | src/sources/soundsourceffmpeg.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sources/soundsourceffmpeg.cpp b/src/sources/soundsourceffmpeg.cpp index 4729191764..d76851f585 100644 --- a/src/sources/soundsourceffmpeg.cpp +++ b/src/sources/soundsourceffmpeg.cpp @@ -968,9 +968,9 @@ const CSAMPLE* SoundSourceFFmpeg::resampleDecodedAVFrame() { #if VERBOSE_DEBUG_LOG avTrace("Received resampled frame", *m_pavResampledFrame); #endif - DEBUG_ASSERT(m_pavDecodedFrame->pts = m_pavResampledFrame->pts); - DEBUG_ASSERT(m_pavDecodedFrame->nb_samples = - m_pavResampledFrame->nb_samples); + DEBUG_ASSERT(m_pavResampledFrame->pts == AV_NOPTS_VALUE || + m_pavResampledFrame->pts == m_pavDecodedFrame->pts); + DEBUG_ASSERT(m_pavResampledFrame->nb_samples == m_pavDecodedFrame->nb_samples); return reinterpret_cast<const CSAMPLE*>( m_pavResampledFrame->extended_data[0]); } else { |