diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-12-16 16:39:02 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-12-16 16:39:02 +0400 |
| commit | 232606e4228ebd3dbfe9b20c2ff6d8a808b37e14 (patch) | |
| tree | c9ba08a4f3659a8831601b1ab72ac114c43d9be5 | |
| parent | 0c4c4e037eb495a034d72e8673733db100db940e (diff) | |
Update ffmpeg
| -rw-r--r-- | demuxer/Demuxers/LAVFDemuxer.cpp | 2 | ||||
| -rw-r--r-- | demuxer/Demuxers/stdafx.h | 1 | ||||
| m--------- | ffmpeg | 0 |
3 files changed, 3 insertions, 0 deletions
diff --git a/demuxer/Demuxers/LAVFDemuxer.cpp b/demuxer/Demuxers/LAVFDemuxer.cpp index e1028143..b876066c 100644 --- a/demuxer/Demuxers/LAVFDemuxer.cpp +++ b/demuxer/Demuxers/LAVFDemuxer.cpp @@ -388,6 +388,8 @@ STDMETHODIMP CLAVFDemuxer::InitAVFormat(LPCOLESTR pszFileName) if (m_bMPEGTS) m_avFormat->max_analyze_duration = (m_avFormat->max_analyze_duration * 3) / 2; + av_opt_set_int(m_avFormat, "correct_ts_overflow", 0, 0); + m_timeOpening = time(NULL); int ret = avformat_find_stream_info(m_avFormat, NULL); if (ret < 0) { diff --git a/demuxer/Demuxers/stdafx.h b/demuxer/Demuxers/stdafx.h index fefb178f..1f608639 100644 --- a/demuxer/Demuxers/stdafx.h +++ b/demuxer/Demuxers/stdafx.h @@ -33,6 +33,7 @@ extern "C" { #include "libavformat/avformat.h" #include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" +#include "libavutil/opt.h" #include "libbluray/bluray.h" } diff --git a/ffmpeg b/ffmpeg -Subproject 08e37f6ada52bee94ed30cfa8dd4d61ec3a42f9 +Subproject 92b0693819eb3f229472d9b9156fffa5ad240db |