virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-12-04 14:00:22 +02:00
Code Issues Releases Activity
Files
648f7a6ec5b34b03074db89ddbf6b2bc39f95ab0
FFmpeg/libavcodec/pthread.c
Michael Niedermayer 4eea41cba1 Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb' 
* commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb':
  lavc: split slice and frame threading functions into separate files

Conflicts:
	libavcodec/Makefile
	libavcodec/pthread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 10:44:34 +01:00

3.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink