summaryrefslogtreecommitdiff
path: root/libavcodec/pthread_internal.h
Commit message (Collapse)AuthorAge
* Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'Michael Niedermayer2013-11-04
| | | | | | | | | | | * 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>
* lavc: split slice and frame threading functions into separate filesAnton Khirnov2013-11-04