Skip to content

Commit

Permalink
Stop using a few deprecated fields
Browse files Browse the repository at this point in the history
  • Loading branch information
Nevcairiel committed Jun 11, 2014
1 parent 6d65bf3 commit 142fe46
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions demuxer/Demuxers/LAVFDemuxer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg
Submodule ffmpeg updated from 2a7f0f to 236b9b

0 comments on commit 142fe46

Please sign in to comment.