diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/mxpegdec.c')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/mxpegdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/mxpegdec.c b/chromium/third_party/ffmpeg/libavcodec/mxpegdec.c index 8eee3b8e9e1..fbd4767db81 100644 --- a/chromium/third_party/ffmpeg/libavcodec/mxpegdec.c +++ b/chromium/third_party/ffmpeg/libavcodec/mxpegdec.c @@ -54,6 +54,7 @@ static av_cold int mxpeg_decode_end(AVCodecContext *avctx) for (i = 0; i < 2; ++i) av_frame_free(&s->picture[i]); + s->bitmask_size = 0; av_freep(&s->mxm_bitmask); av_freep(&s->completion_bitmask); @@ -295,11 +296,11 @@ static int mxpeg_decode_frame(AVCodecContext *avctx, AV_GET_BUFFER_FLAG_REF)) < 0) return ret; - ret = ff_mjpeg_decode_sos(jpg, s->mxm_bitmask, reference_ptr); + ret = ff_mjpeg_decode_sos(jpg, s->mxm_bitmask, s->bitmask_size, reference_ptr); if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) return ret; } else { - ret = ff_mjpeg_decode_sos(jpg, NULL, NULL); + ret = ff_mjpeg_decode_sos(jpg, NULL, 0, NULL); if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) return ret; } |