diff options
| author | Ramiro Polla <ramiro@lisha.ufsc.br> | 2007-03-12 17:13:20 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-03-12 17:13:20 +0000 |
| commit | 2a89ee9a63f0ef787f81f388c118e64c4515f158 (patch) | |
| tree | bdcbbb595d3a4b20d63b381da0d9899f6eaa38db /ffmpeg.c | |
| parent | 3d3361e50976862285cc0f2c28b94c295ba630d0 (diff) | |
| download | android_external_ffmpeg-2a89ee9a63f0ef787f81f388c118e64c4515f158.tar.gz android_external_ffmpeg-2a89ee9a63f0ef787f81f388c118e64c4515f158.tar.bz2 android_external_ffmpeg-2a89ee9a63f0ef787f81f388c118e64c4515f158.zip | |
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
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -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; |