Merge commit '0994e142132200c706f704271b5a7ae81d128f5c'

* commit '0994e142132200c706f704271b5a7ae81d128f5c':
  pthread: Check memory allocation

Conflicts:
	libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/pthread_frame.c
index e80990558bb3159c8db4e4df1ca46fe893ca9cba,d7f742ba7d2e9ee4f84ea1fa0bb8c07aedaf80c0..a3fd1fff75828272576f55ca7cba4db1aa8e4384
--- 1/libavcodec/pthread_frame.c
--- 2/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@@ -637,8 -584,15 +637,15 @@@ int ff_frame_thread_init(AVCodecContex
      }
  
      avctx->internal->thread_ctx = fctx = av_mallocz(sizeof(FrameThreadContext));
+     if (!fctx)
+         return AVERROR(ENOMEM);
  
 -    fctx->threads = av_mallocz(sizeof(PerThreadContext) * thread_count);
 +    fctx->threads = av_mallocz_array(thread_count, sizeof(PerThreadContext));
+     if (!fctx->threads) {
+         av_freep(&avctx->internal->thread_ctx);
+         return AVERROR(ENOMEM);
+     }
+ 
      pthread_mutex_init(&fctx->buffer_mutex, NULL);
      fctx->delaying = 1;