Tidy up careful_string_filter and add some extra transliterations.

[dcpomatic.git] / src / lib / ffmpeg.cc

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 77717a38f3c1dcf8af1cf367ba59e3e7211d7b29..6c8509b6cd71de2eef9e5a75e3c58b2e9f1cd87f 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -30,6 +30,7 @@
 #include "ffmpeg_subtitle_stream.h"
 #include "film.h"
 #include "log.h"
+#include "memory_util.h"
 #include "util.h"
 #include <dcp/raw_convert.h>
 extern "C" {
@@ -148,6 +149,11 @@ FFmpeg::setup_general ()
        for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
                auto s = _format_context->streams[i];
                if (s->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && avcodec_find_decoder(s->codecpar->codec_id)) {
+                       auto const frame_rate = av_q2d(s->avg_frame_rate);
+                       if (frame_rate < 1 || frame_rate > 1000) {
+                               /* Ignore video streams with crazy frame rates.  These are usually things like album art on MP3s. */
+                               continue;
+                       }
                        if (s->avg_frame_rate.num > 0 && s->avg_frame_rate.den > 0) {
                                /* This is definitely our video stream */
                                _video_stream = i;
@@ -165,11 +171,6 @@ 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