diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2017-04-21 23:50:32 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2017-04-21 23:50:32 +0300 |
| commit | 3e546af5b8e972a5b5445ba1f86fac66fe601e50 (patch) | |
| tree | ed64dc2d1076d5718614537565eec6610861cfe7 | |
| parent | de24ae176d8fa8727c220858d2bcc3ff6fa5e966 (diff) | |
avcodec: always parse mpeg1/2
| -rw-r--r-- | decoder/LAVVideo/decoders/avcodec.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/decoder/LAVVideo/decoders/avcodec.cpp b/decoder/LAVVideo/decoders/avcodec.cpp index 8640fa7f..17e34d81 100644 --- a/decoder/LAVVideo/decoders/avcodec.cpp +++ b/decoder/LAVVideo/decoders/avcodec.cpp @@ -314,15 +314,16 @@ STDMETHODIMP CDecAvcodec::InitDecoder(AVCodecID codec, const CMediaType *pmt) DWORD dwDecFlags = m_pCallback->GetDecodeFlags(); - if(!(dwDecFlags & LAV_VIDEO_DEC_FLAG_LAVSPLITTER) && - (codec == AV_CODEC_ID_MPEG1VIDEO + // Use parsing for mpeg1/2 at all times, or H264/HEVC when its not from LAV Splitter + if( codec == AV_CODEC_ID_MPEG1VIDEO || codec == AV_CODEC_ID_MPEG2VIDEO - || pmt->subtype == MEDIASUBTYPE_H264 - || pmt->subtype == MEDIASUBTYPE_h264 - || pmt->subtype == MEDIASUBTYPE_X264 - || pmt->subtype == MEDIASUBTYPE_x264 - || pmt->subtype == MEDIASUBTYPE_H264_bis - || pmt->subtype == MEDIASUBTYPE_HEVC)) { + || (!(dwDecFlags & LAV_VIDEO_DEC_FLAG_LAVSPLITTER) && + (pmt->subtype == MEDIASUBTYPE_H264 + || pmt->subtype == MEDIASUBTYPE_h264 + || pmt->subtype == MEDIASUBTYPE_X264 + || pmt->subtype == MEDIASUBTYPE_x264 + || pmt->subtype == MEDIASUBTYPE_H264_bis + || pmt->subtype == MEDIASUBTYPE_HEVC))) { m_pParser = av_parser_init(codec); } |