aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamiro Polla <ramiro@lisha.ufsc.br>2007-03-12 17:13:20 +0000
committerDiego Biurrun <diego@biurrun.de>2007-03-12 17:13:20 +0000
commit2a89ee9a63f0ef787f81f388c118e64c4515f158 (patch)
treebdcbbb595d3a4b20d63b381da0d9899f6eaa38db
parent3d3361e50976862285cc0f2c28b94c295ba630d0 (diff)
downloadffmpeg-2a89ee9a63f0ef787f81f388c118e64c4515f158.tar.gz
Remove superfluous HAVE_THREADS #ifdef.
patch by Ramiro Polla, angustia arrozcru.no-ip org Originally committed as revision 8348 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c6
-rw-r--r--ffplay.c2
2 files changed, 0 insertions, 8 deletions
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;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(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: