X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.cc;h=8eb19816c0828b44b1dfc82bc030f19d37378ea5;hb=3dc465914c2853923535ab630457874c11b1db3e;hp=17ec564d321fa04fbec6f1760816500fc53a53e5;hpb=125ef6e49a0a20ab6ee7c95f80c710ec9efc3c00;p=dcpomatic.git

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 17ec564d3..8eb19816c 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -116,15 +116,16 @@ FFmpeg::setup_general ()
 	_file_group.set_paths (_ffmpeg_content->paths ());
 	_avio_buffer = static_cast<uint8_t*> (wrapped_av_malloc (_avio_buffer_size));
 	_avio_context = avio_alloc_context (_avio_buffer, _avio_buffer_size, 0, this, avio_read_wrapper, 0, avio_seek_wrapper);
+	if (!_avio_context) {
+		throw std::bad_alloc ();
+	}
 	_format_context = avformat_alloc_context ();
+	if (!_format_context) {
+		throw std::bad_alloc ();
+	}
 	_format_context->pb = _avio_context;
 
 	AVDictionary* options = 0;
-	/* These durations are in microseconds, and represent how far into the content file
-	   we will look for streams.
-	*/
-	av_dict_set (&options, "analyzeduration", raw_convert<string> (5 * 60 * 1000000).c_str(), 0);
-	av_dict_set (&options, "probesize", raw_convert<string> (5 * 60 * 1000000).c_str(), 0);
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	if (_ffmpeg_content->kdm()) {
 		DecryptedECinemaKDM kdm (_ffmpeg_content->kdm().get(), Config::instance()->decryption_chain()->key().get());
@@ -134,7 +135,7 @@ FFmpeg::setup_general ()
 
 	int e = avformat_open_input (&_format_context, 0, 0, &options);
 	if (e < 0) {
-		throw OpenFileError (_ffmpeg_content->path(0).string(), e, true);
+		throw OpenFileError (_ffmpeg_content->path(0).string(), e, OpenFileError::READ);
 	}
 
 	if (avformat_find_stream_info (_format_context, 0) < 0) {
@@ -165,6 +166,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