2 Commits

Author	SHA1	Message	Date
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
Anton Khirnov	cc14ee03a7	lavc: split slice and frame threading functions into separate files	2013-11-04 08:51:26 +01:00