[Ffmpeg-cvslog] r8348 - in trunk: ffmpeg.c ffplay.c

[diego]

Author: diego
Date: Mon Mar 12 18:13:20 2007
New Revision: 8348

Modified:
   trunk/ffmpeg.c
   trunk/ffplay.c

Log:
Remove superfluous HAVE_THREADS #ifdef.
patch by Ramiro Polla, angustia arrozcru.no-ip org


Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Mon Mar 12 18:13:20 2007
@@ -2565,10 +2565,8 @@ static void opt_input_file(const char *f
     for(i=0;i<ic->nb_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(AVFormatCon
     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(AVFormatCon
     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;

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	(original)
+++ trunk/ffplay.c	Mon Mar 12 18:13:20 2007
@@ -1704,10 +1704,8 @@ static int stream_component_open(VideoSt
     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: