diff --git a/ffmpeg.c b/ffmpeg.c index ba1125e171..76521bbe10 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2565,10 +2565,8 @@ static void opt_input_file(const char *filename) for(i=0;inb_streams;i++) { int j; AVCodecContext *enc = ic->streams[i]->codec; -#if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(enc, thread_count); -#endif enc->thread_count= thread_count; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: @@ -2691,10 +2689,8 @@ static void new_video_stream(AVFormatContext *oc) bitstream_filters[nb_output_files][oc->nb_streams - 1]= video_bitstream_filters; video_bitstream_filters= NULL; -#if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(st->codec, thread_count); -#endif video_enc = st->codec; @@ -2851,10 +2847,8 @@ static void new_audio_stream(AVFormatContext *oc) bitstream_filters[nb_output_files][oc->nb_streams - 1]= audio_bitstream_filters; audio_bitstream_filters= NULL; -#if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(st->codec, thread_count); -#endif audio_enc = st->codec; audio_enc->codec_type = CODEC_TYPE_AUDIO; diff --git a/ffplay.c b/ffplay.c index a93425f686..ecf2c5be39 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1704,10 +1704,8 @@ static int stream_component_open(VideoState *is, int stream_index) if (!codec || avcodec_open(enc, codec) < 0) return -1; -#if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(enc, thread_count); -#endif enc->thread_count= thread_count; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: