diff --git a/app/decoder/ffmpeg/ffmpegdecoder.cpp b/app/decoder/ffmpeg/ffmpegdecoder.cpp index 590f7fddc..b023d6a54 100644 --- a/app/decoder/ffmpeg/ffmpegdecoder.cpp +++ b/app/decoder/ffmpeg/ffmpegdecoder.cpp @@ -193,7 +193,7 @@ FramePtr FFmpegDecoder::Retrieve(const rational &timecode, const rational &lengt int64_t target_ts = qFloor(timecode.toDouble() * rational(avstream_->time_base).flipped().toDouble()); // Index now if we haven't already - if (frame_index_.isEmpty() && !LoadIndex()) { + if (frame_index_.isEmpty() && !LoadFrameIndex()) { Index(); } @@ -447,7 +447,7 @@ void FFmpegDecoder::Index() } // Save index to file - SaveIndex(); + SaveFrameIndex(); } QString FFmpegDecoder::GetIndexFilename() @@ -461,7 +461,7 @@ QString FFmpegDecoder::GetIndexFilename() .append(QString::number(avstream_->index)); } -bool FFmpegDecoder::LoadIndex() +bool FFmpegDecoder::LoadFrameIndex() { // Load index from file QFile index_file(GetIndexFilename()); @@ -486,7 +486,7 @@ bool FFmpegDecoder::LoadIndex() return false; } -void FFmpegDecoder::SaveIndex() +void FFmpegDecoder::SaveFrameIndex() { // Save index to file QFile index_file(GetIndexFilename()); diff --git a/app/decoder/ffmpeg/ffmpegdecoder.h b/app/decoder/ffmpeg/ffmpegdecoder.h index 7fb4a6e80..63e9d4066 100644 --- a/app/decoder/ffmpeg/ffmpegdecoder.h +++ b/app/decoder/ffmpeg/ffmpegdecoder.h @@ -53,8 +53,9 @@ private: void Index(); QString GetIndexFilename(); - bool LoadIndex(); - void SaveIndex(); + + bool LoadFrameIndex(); + void SaveFrameIndex(); AVPixelFormat GetCompatiblePixelFormat(const AVPixelFormat& pix_fmt);