diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 01:58:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 02:15:16 +0200 |
| commit | 333eb37a967a6e5299e63adaadec3bb9b8b2bbbd (patch) | |
| tree | a8797ddee1a6f05eb29b3024f54abfeefb4eb3e1 /libavcodec | |
| parent | 893e61734f961eeeb005c008174f1399a37167b2 (diff) | |
| download | ffmpeg-333eb37a967a6e5299e63adaadec3bb9b8b2bbbd.tar.gz | |
avcodec/h264: silence ER warning when no slice threads are used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 11f1055882..62cb241b86 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -705,7 +705,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx) if (h->enable_er < 0 && (avctx->active_thread_type & FF_THREAD_SLICE)) h->enable_er = 0; - if (h->enable_er) { + if (h->enable_er && (avctx->active_thread_type & FF_THREAD_SLICE)) { av_log(avctx, AV_LOG_WARNING, "Error resilience with slice threads is enabled. It is unsafe and unsupported and may crash. " "Use it at your own risk\n"); |