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/options.c | |
| 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/options.c')
| -rw-r--r-- | libavcodec/options.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 266a7f1297..5ee9d6bd73 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -173,7 +173,6 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) dest->codec = NULL; dest->slice_offset = NULL; dest->hwaccel = NULL; - dest->thread_opaque = NULL; dest->internal = NULL; /* reallocate values that should be allocated separately */ |