diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 11:49:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 11:49:00 +0200 |
| commit | 36d349034e19e111cc43de7a0e5749f8235b3bf9 (patch) | |
| tree | 1806d2f1e7c53f6f0334666d0b48b4b21181095b | |
| parent | 1e9a050bc020825094684ba27fc28025bf0a8088 (diff) | |
| parent | 30e256430eb88c6d4c382581b89bca171d79fbc0 (diff) | |
| download | ffmpeg-36d349034e19e111cc43de7a0e5749f8235b3bf9.tar.gz | |
Merge commit '30e256430eb88c6d4c382581b89bca171d79fbc0'
* commit '30e256430eb88c6d4c382581b89bca171d79fbc0':
lavc/pthread: remove obsolete checks
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pthread.c | 7 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 5074f4a64a..e5ffbbf1b8 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -1146,23 +1146,16 @@ static void validate_thread_parameters(AVCodecContext *avctx) int ff_thread_init(AVCodecContext *avctx) { - if (avctx->thread_opaque) { - av_log(avctx, AV_LOG_ERROR, "avcodec_thread_init is ignored after avcodec_open\n"); - return -1; - } - #if HAVE_W32THREADS w32thread_init(); #endif - if (avctx->codec) { validate_thread_parameters(avctx); if (avctx->active_thread_type&FF_THREAD_SLICE) return thread_init(avctx); else if (avctx->active_thread_type&FF_THREAD_FRAME) return frame_thread_init(avctx); - } return 0; } diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 573bba6342..25c6386aae 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1173,7 +1173,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code goto free_and_end; } - if (HAVE_THREADS && !avctx->thread_opaque + if (HAVE_THREADS && !(avctx->internal->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))) { ret = ff_thread_init(avctx); if (ret < 0) { |