diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-06-01 19:34:29 +0400 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-06-01 19:34:29 +0400 |
commit | 27177a9126151c02de4ff783a2a1fdca301e4cf4 (patch) | |
tree | ab63b4b7fe7510bf1983cb100c234cc5b43965be | |
parent | d387fefff55126cd2b4d6d5d42b3407af25249dd (diff) |
Update ffmpeg for jp2k crash fix
-rw-r--r-- | decoder/LAVVideo/decoders/avcodec.cpp | 3 | ||||
m--------- | ffmpeg | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/decoder/LAVVideo/decoders/avcodec.cpp b/decoder/LAVVideo/decoders/avcodec.cpp index 5d77293a..8e9d7726 100644 --- a/decoder/LAVVideo/decoders/avcodec.cpp +++ b/decoder/LAVVideo/decoders/avcodec.cpp @@ -546,7 +546,8 @@ STDMETHODIMP CDecAvcodec::InitDecoder(AVCodecID codec, const CMediaType *pmt) || codec == AV_CODEC_ID_MPEG4; m_bNoBufferConsumption = codec == AV_CODEC_ID_MJPEGB - || codec == AV_CODEC_ID_LOCO; + || codec == AV_CODEC_ID_LOCO + || codec == AV_CODEC_ID_JPEG2000; m_bHasPalette = m_pAVCtx->bits_per_coded_sample <= 8 && m_pAVCtx->extradata_size && !(dwDecFlags & LAV_VIDEO_DEC_FLAG_LAVSPLITTER) && (codec == AV_CODEC_ID_MSVIDEO1 diff --git a/ffmpeg b/ffmpeg -Subproject ed0b89246e3485c168f811b45c72ad589253182 +Subproject 95718cec17377d62dc27e9c8e445a38b52f2acb |