github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2013-11-04	Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'	Michael Niedermayer
	* commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12': pthread: store thread contexts in AVCodecInternal instead of AVCodecContext Conflicts: libavcodec/internal.h libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04	Merge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'	Michael Niedermayer
	* commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18': pthread_slice: rename ThreadContext -> SliceThreadContext Conflicts: libavcodec/pthread_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04	Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'	Michael Niedermayer
	* 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	pthread: store thread contexts in AVCodecInternal instead of AVCodecContext	Anton Khirnov
	It's a private field, it should not be visible to callers. Deprecate AVCodecContext.thread_opaque
2013-11-04	pthread_slice: rename ThreadContext -> SliceThreadContext	Anton Khirnov
	This should prevent confusion with frame threading.
2013-11-04	lavc: split slice and frame threading functions into separate files	Anton Khirnov