Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 08:35:44 +0000 (10:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 08:35:44 +0000 (10:35 +0200)
* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e':
  h264: check one context_init() allocation

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c

@@@ -1709,8 -1637,11 +1709,12 @@@ static int decode_update_thread_context
              av_log(dst, AV_LOG_ERROR, "Could not allocate memory for h264\n");
              return ret;
          }
-         context_init(h);
+         ret = context_init(h);
+         if (ret < 0) {
+             av_log(dst, AV_LOG_ERROR, "context_init() failed.\n");
+             return ret;
+         }
 +        }
  
          for (i = 0; i < 2; i++) {
              h->rbsp_buffer[i]      = NULL;