Ignore video streams with frame rates over 1000 (work-around/fix for #1585).

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 17ec564d321fa04fbec6f1760816500fc53a53e5..adc5c224c6f4e8ea408287de3a7360f3cb3e25fc 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -165,6 +165,11 @@ FFmpeg::setup_general ()
                _video_stream = video_stream_undefined_frame_rate.get();
        }
 
+       /* Ignore video streams with crazy frame rates.  These are usually things like album art on MP3s. */
+       if (_video_stream && av_q2d(av_guess_frame_rate(_format_context, _format_context->streams[_video_stream.get()], 0)) > 1000) {
+               _video_stream = optional<int>();
+       }
+
        /* Hack: if the AVStreams have duplicate IDs, replace them with our
           own.  We use the IDs so that we can cope with VOBs, in which streams
           move about in index but remain with the same ID in different