Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb' | Michael Niedermayer | 2013-11-04 | 1 | -4/+4 |
| | | | | | | | | | | | * 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 files | Anton Khirnov | 2013-11-04 | 1 | -0/+34 |