diff --git a/demuxer/Demuxers/LAVFDemuxer.cpp b/demuxer/Demuxers/LAVFDemuxer.cpp
index 74b513902..ba5e27d2d 100644
--- a/demuxer/Demuxers/LAVFDemuxer.cpp
+++ b/demuxer/Demuxers/LAVFDemuxer.cpp
@@ -416,12 +416,12 @@ STDMETHODIMP CLAVFDemuxer::InitAVFormat(LPCOLESTR pszFileName, BOOL bForce)
   // decrease analyze duration for network streams
   if (m_avFormat->flags & AVFMT_FLAG_NETWORK || (m_avFormat->flags & AVFMT_FLAG_CUSTOM_IO && !m_avFormat->pb->seekable)) {
     // require at least 0.2 seconds
-    m_avFormat->max_analyze_duration = max(m_pSettings->GetNetworkStreamAnalysisDuration() * 1000, 200000);
+    m_avFormat->max_analyze_duration2 = max(m_pSettings->GetNetworkStreamAnalysisDuration() * 1000, 200000);
   } else {
-    m_avFormat->max_analyze_duration = 7500000;
+    m_avFormat->max_analyze_duration2 = 7500000;
     // And increase it for mpeg-ts/ps files
     if (m_bMPEGTS || m_bMPEGPS) {
-      m_avFormat->max_analyze_duration = 15000000;
+      m_avFormat->max_analyze_duration2 = 15000000;
       m_avFormat->probesize = 75000000;
     }
   }
diff --git a/ffmpeg b/ffmpeg
index 2a7f0f213..236b9be7d 160000
--- a/ffmpeg
+++ b/ffmpeg
@@ -1 +1 @@
-Subproject commit 2a7f0f2135b3b427a42908d77d2d220b0c94a1cb
+Subproject commit 236b9be7dbc5d92c1fee483684624666323df078