summaryrefslogtreecommitdiffstats
path: root/src/sources
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2021-04-05 14:39:29 +0200
committerUwe Klotz <uklotz@mixxx.org>2021-04-05 14:39:29 +0200
commit21c3730598ebd7263108b3bdf340910589c1122d (patch)
tree71143054d736ed5cb79f749de420e0afd0bbf074 /src/sources
parent3d0767569b0ccb5cb0edd8e991756aba8870fa53 (diff)
parent48927dbd9586f7923c987fe90f7f20e6b1887291 (diff)
Merge branch 'main' of git@github.com:mixxxdj/mixxx.git into remove-trackfile
Diffstat (limited to 'src/sources')
-rw-r--r--src/sources/soundsourceffmpeg.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sources/soundsourceffmpeg.cpp b/src/sources/soundsourceffmpeg.cpp
index 94582fd927..5b5b66ed38 100644
--- a/src/sources/soundsourceffmpeg.cpp
+++ b/src/sources/soundsourceffmpeg.cpp
@@ -353,8 +353,8 @@ QStringList SoundSourceProviderFFmpeg::getSupportedFileExtensions() const {
while ((pavInputFormat = av_iformat_next(pavInputFormat))) {
#else
const AVInputFormat* pavInputFormat = nullptr;
- void* iInputFormat = 0;
- while ((pavInputFormat = av_demuxer_iterate(&iInputFormat))) {
+ void* pOpaqueInputFormatIterator = nullptr;
+ while ((pavInputFormat = av_demuxer_iterate(&pOpaqueInputFormatIterator))) {
#endif
if (pavInputFormat->flags | AVFMT_SEEK_TO_PTS) {
///////////////////////////////////////////////////////////
@@ -897,7 +897,7 @@ bool SoundSourceFFmpeg::consumeNextAVPacket(
}
*ppavNextPacket = pavPacket;
}
- auto pavNextPacket = *ppavNextPacket;
+ auto* pavNextPacket = *ppavNextPacket;
// Consume raw packet data
#if VERBOSE_DEBUG_LOG