diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-01 14:34:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-01 14:34:26 +0200 |
| commit | 79b00fc33b5cb6d56d29b50efac6d62ce3a89018 (patch) | |
| tree | 77d8179bb3d9d76d9ec4fcfe396a35afcc8f73cd /media/ffvpx/libavcodec/pthread_slice.c | |
| parent | ab881a3bf513e591b6cc2966560cdab2b63a0f2a (diff) | |
| parent | 7d1ee0e5e4958175ccde5d153b025f97a17caeb2 (diff) | |
| download | UXP-79b00fc33b5cb6d56d29b50efac6d62ce3a89018.tar UXP-79b00fc33b5cb6d56d29b50efac6d62ce3a89018.tar.gz UXP-79b00fc33b5cb6d56d29b50efac6d62ce3a89018.tar.lz UXP-79b00fc33b5cb6d56d29b50efac6d62ce3a89018.tar.xz UXP-79b00fc33b5cb6d56d29b50efac6d62ce3a89018.zip | |
Merge pull request #801 from trav90/update-from-upstream
Update ffvpx code to 4.0.2
Diffstat (limited to 'media/ffvpx/libavcodec/pthread_slice.c')
| -rw-r--r-- | media/ffvpx/libavcodec/pthread_slice.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/media/ffvpx/libavcodec/pthread_slice.c b/media/ffvpx/libavcodec/pthread_slice.c index d659f9b0b..77cfe3c9f 100644 --- a/media/ffvpx/libavcodec/pthread_slice.c +++ b/media/ffvpx/libavcodec/pthread_slice.c @@ -132,10 +132,6 @@ int ff_slice_thread_init(AVCodecContext *avctx) int thread_count = avctx->thread_count; static void (*mainfunc)(void *); -#if HAVE_W32THREADS - w32thread_init(); -#endif - // We cannot do this in the encoder init as the threads are created before if (av_codec_is_encoder(avctx->codec) && avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && |