summaryrefslogtreecommitdiff
path: root/libavcodec/pthread.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-05-11 17:30:53 +0200
committerAnton Khirnov <anton@khirnov.net>2013-05-17 07:44:40 +0200
commit30e256430eb88c6d4c382581b89bca171d79fbc0 (patch)
treef6fc9e8c992bcf08565b91e0c5613f832d660295 /libavcodec/pthread.c
parent16a645adeb758207346a4bbf66766f02734c461e (diff)
lavc/pthread: remove obsolete checks
Those were useful when avcodec_thread_init() was a public functions. It was deprecated and removed some time ago, so those checks are not needed anymore.
Diffstat (limited to 'libavcodec/pthread.c')
-rw-r--r--libavcodec/pthread.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 1dbfe3d221..0ef4588a04 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -1042,23 +1042,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;
}