Merge commit '0994e142132200c706f704271b5a7ae81d128f5c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:25:04 +0000 (02:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:25:04 +0000 (02:25 +0200)
commit6ed8341cb163e4c253449458aa21a0b3aab1e2b6
tree918a2c8b973f38a28c540984f39c0e2021d6edb3
parent615e73ab4f8cd85e490c7d141fd710385bfaa8ac
parent0994e142132200c706f704271b5a7ae81d128f5c
Merge commit '0994e142132200c706f704271b5a7ae81d128f5c'

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

Conflicts:
libavcodec/pthread_frame.c

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