Ignore frames with format changes with variableformat=false

This fixes things like dv files with single spurious corrupt/different format frames
vapoursynth · Oct 17, 2024 · cc2b8b7 · cc2b8b7
1 parent 5cc9de9
commit cc2b8b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/audiosource.cpp b/src/audiosource.cpp
@@ -55,7 +55,7 @@ bool LWAudioDecoder::DecodeNextFrame(bool SkipOutput) {
         int Ret = avcodec_receive_frame(CodecContext, DecodeFrame);
         if (Ret == 0) {
             return true;
-        } else if (Ret == AVERROR(EAGAIN)) {
+        } else if (Ret == AVERROR(EAGAIN) || Ret == AVERROR_INPUT_CHANGED) { // AVERROR_INPUT_CHANGED is only used for two things inside FFmpeg and the other one can't happen, therefore we don't need to care about whether or not variable format is allowed
             if (ReadPacket()) {
                 avcodec_send_packet(CodecContext, Packet);
                 av_packet_unref(Packet);

diff --git a/src/videosource.cpp b/src/videosource.cpp
@@ -100,7 +100,7 @@ bool LWVideoDecoder::DecodeNextFrame(bool SkipOutput) {
                 }
             }
             return true;
-        } else if (Ret == AVERROR(EAGAIN)) {
+        } else if (Ret == AVERROR(EAGAIN) || Ret == AVERROR_INPUT_CHANGED) { // AVERROR_INPUT_CHANGED is only used for two things inside FFmpeg and the other one can't happen, therefore we don't need to care about whether or not variable format is allowed
             if (ReadPacket()) {
                 avcodec_send_packet(CodecContext, Packet);
                 av_packet_unref(Packet);