diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 14:14:38 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 14:14:38 +0400 |
| commit | 3fc26d8073a49c96a0704015ce18f5317d87a739 (patch) | |
| tree | 54e7c6782281bf070c91faf63371a1980e92da38 /libavcodec/internal.h | |
| parent | 2a7cbc29a8aa0db2bcee95123a83c13d02f0f753 (diff) | |
| parent | 38ecc3702dabbea09230f6d6333f59e74f5d1c12 (diff) | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index bfeb0962fd..2e216a1f28 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -95,6 +95,8 @@ typedef struct AVCodecInternal { FramePool *pool; + void *thread_ctx; + /** * temporary buffer used for encoders to store their bitstream */ |