From 3e56ff52385513e78fbe3b03e9787a6606b762d9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Dec 2019 22:56:49 +0000 Subject: Remove our forcing of analyzeduration and probesize as they seem to cause weird problems when scanning some files. The unit test case added here is a case in point: before this patch one stream reported an incorrect channel count and sample rate. It's a bit worrying as these parameters have been in DoM for many years, but perhaps they have become unnecessary / harmful with changes to FFmpeg. --- src/lib/ffmpeg.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/lib/ffmpeg.cc') diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index 0668f9f37..8dc525db9 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -120,11 +120,6 @@ FFmpeg::setup_general () _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 (5 * 60 * 1000000).c_str(), 0); - av_dict_set (&options, "probesize", raw_convert (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()); -- cgit v1.2.3