diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-11-29 20:05:37 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-11-29 20:05:54 +0400 |
| commit | c9f6e3f12a566e17712ac9b170bd1e47e9502bb0 (patch) | |
| tree | b0d060810f9bcab652447d51768bc7c54833e563 /demuxer | |
| parent | cc7a7da4f71bd320e630870b7874783152cd355c (diff) | |
Make sure side-data is merged until a proper solution is implemented
Diffstat (limited to 'demuxer')
| -rw-r--r-- | demuxer/Demuxers/LAVFDemuxer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/demuxer/Demuxers/LAVFDemuxer.cpp b/demuxer/Demuxers/LAVFDemuxer.cpp index 2df63304..f8104a3a 100644 --- a/demuxer/Demuxers/LAVFDemuxer.cpp +++ b/demuxer/Demuxers/LAVFDemuxer.cpp @@ -437,8 +437,11 @@ STDMETHODIMP CLAVFDemuxer::InitAVFormat(LPCOLESTR pszFileName, BOOL bForce) av_opt_set_int(m_avFormat, "correct_ts_overflow", !m_pBluRay, 0); + // TODO: AVFMT_FLAG_KEEP_SIDE_DATA should be ON for all formats if (m_bMatroska) m_avFormat->flags |= AVFMT_FLAG_KEEP_SIDE_DATA; + else + m_avFormat->flags &= ~AVFMT_FLAG_KEEP_SIDE_DATA; m_timeOpening = time(NULL); int ret = avformat_find_stream_info(m_avFormat, NULL); |