-
Michael Niedermayer authored
* commit 'daa7a1d4': pthread_slice: rename ThreadContext -> SliceThreadContext Conflicts: libavcodec/pthread_slice.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
2a7cbc29
* commit 'daa7a1d4': pthread_slice: rename ThreadContext -> SliceThreadContext Conflicts: libavcodec/pthread_slice.c Merged-by:Michael Niedermayer <michaelni@gmx.at>