mjpegdec: Properly fail on malloc failure

[ffmpeg] / libavcodec / error_resilience.h

diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h
index 7b9ec1918e0f4706e8cb3609d90c3d7bcdf884eb..3139880362ea8f2cdb6ff1c75b582d95785f755d 100644 (file)
--- a/libavcodec/error_resilience.h
+++ b/libavcodec/error_resilience.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
@@ -42,7 +41,7 @@ typedef struct ERPicture {
     AVFrame *f;
     ThreadFrame *tf;
 
-    // it's the caller responsability to allocate these buffers
+    // it is the caller's responsibility to allocate these buffers
     int16_t (*motion_val[2])[2];
     int8_t *ref_index[2];
 
@@ -52,7 +51,8 @@ typedef struct ERPicture {
 
 typedef struct ERContext {
     AVCodecContext *avctx;
-    MECmpContext *mecc;
+    MECmpContext mecc;
+    int mecc_inited;
 
     int *mb_index2xy;
     int mb_num;