diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-21 00:36:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-31 00:24:51 +0100 |
| commit | 3fc75e79cf033fbe575b663d9e8b56cc835b95ef (patch) | |
| tree | c39114ae9d868e3e188cf68ecbf91100ed190905 | |
| parent | 30463a0c9985c44e8064b1630e242debc48bc755 (diff) | |
| download | ffmpeg-3fc75e79cf033fbe575b663d9e8b56cc835b95ef.tar.gz | |
avcodec/mpeg12enc: Move high resolution thread check to before initializing threads
Cleaner solution is welcome!
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a53fbda9dc92273054a103db7539d2bb6e9632b2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mpeg12enc.c | 3 | ||||
| -rw-r--r-- | libavcodec/pthread_slice.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 451463c0cd..8baa60ee0b 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -144,9 +144,6 @@ static av_cold int encode_init(AVCodecContext *avctx) { MpegEncContext *s = avctx->priv_data; - if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && avctx->height > 2800) - avctx->thread_count = 1; - if (ff_mpv_encode_init(avctx) < 0) return -1; diff --git a/libavcodec/pthread_slice.c b/libavcodec/pthread_slice.c index b948e16d24..a3bcd21fea 100644 --- a/libavcodec/pthread_slice.c +++ b/libavcodec/pthread_slice.c @@ -181,6 +181,12 @@ int ff_slice_thread_init(AVCodecContext *avctx) 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 && + avctx->height > 2800) + thread_count = avctx->thread_count = 1; + if (!thread_count) { int nb_cpus = av_cpu_count(); if (avctx->height) |