generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
2a4700a4f03280fa8ba4fc0f8a9987bb550f0d1e
ffmpeg/libavcodec/pthread_frame.c
Michael Niedermayer 6ed8341cb1 Merge commit '0994e142132200c706f704271b5a7ae81d128f5c' 
* commit '0994e142132200c706f704271b5a7ae81d128f5c':
  pthread: Check memory allocation

Conflicts:
	libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01 02:25:04 +02:00

29 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink