Michael Niedermayer
3fc26d8073
Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'
...
* commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12':
pthread: store thread contexts in AVCodecInternal instead of AVCodecContext
Conflicts:
libavcodec/internal.h
libavcodec/utils.c
Merged-by: Michael Niedermayer <[email protected]
2013-11-04 11:14:38 +01:00
Michael Niedermayer
2a7cbc29a8
Merge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'
...
* commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18':
pthread_slice: rename ThreadContext -> SliceThreadContext
Conflicts:
libavcodec/pthread_slice.c
Merged-by: Michael Niedermayer <[email protected]
2013-11-04 11:05:52 +01:00
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 <[email protected]
2013-11-04 10:44:34 +01:00
Anton Khirnov
38ecc3702d
pthread: store thread contexts in AVCodecInternal instead of AVCodecContext
...
It's a private field, it should not be visible to callers.
Deprecate AVCodecContext.thread_opaque
2013-11-04 08:51:26 +01:00
Anton Khirnov
daa7a1d443
pthread_slice: rename ThreadContext -> SliceThreadContext
...
This should prevent confusion with frame threading.
2013-11-04 08:51:26 +01:00
Anton Khirnov
cc14ee03a7
lavc: split slice and frame threading functions into separate files
2013-11-04 08:51:26 +01:00
Michael Niedermayer