-
Michael Niedermayer authored
* commit '0994e142': pthread: Check memory allocation Conflicts: libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
6ed8341c
* commit '0994e142': pthread: Check memory allocation Conflicts: libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>