diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-02 03:10:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-02 03:10:52 +0100 |
| commit | 157f29f9a6b0214e979fbcfe39233908f558e4a9 (patch) | |
| tree | 750265f016d41c7742ea2040d3ab3684fb3ec785 | |
| parent | 4121148388f4fd02ace89eca364904d3ea8bcfe7 (diff) | |
| download | ffmpeg-157f29f9a6b0214e979fbcfe39233908f558e4a9.tar.gz | |
Revert "mpegvideo: Do not error out on default values of thread_count."
This is not needed anymore.
This reverts commit ca0350f49b82663123f7fb4fddcafa7c874a96a4.
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 7c584813e8..77e251e00c 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -580,10 +580,10 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) } if (s->avctx->thread_count < 1) { - av_log(avctx, AV_LOG_INFO, + av_log(avctx, AV_LOG_ERROR, "automatic thread number detection not supported by codec, " "patch welcome\n"); - s->avctx->thread_count = 1; + return -1; } if (s->avctx->thread_count > 1) |