Revision 40ccc754

View differences:

ffmpeg.c
2931 2931
    for(i=0;i<ic->nb_streams;i++) {
2932 2932
        AVStream *st = ic->streams[i];
2933 2933
        AVCodecContext *enc = st->codec;
2934
            avcodec_thread_init(enc, thread_count);
2934
        avcodec_thread_init(enc, thread_count);
2935 2935
        switch(enc->codec_type) {
2936 2936
        case CODEC_TYPE_AUDIO:
2937 2937
            set_context_opts(enc, avcodec_opts[CODEC_TYPE_AUDIO], AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM);
......
3065 3065
    bitstream_filters[nb_output_files][oc->nb_streams - 1]= video_bitstream_filters;
3066 3066
    video_bitstream_filters= NULL;
3067 3067

  
3068
        avcodec_thread_init(st->codec, thread_count);
3068
    avcodec_thread_init(st->codec, thread_count);
3069 3069

  
3070 3070
    video_enc = st->codec;
3071 3071

  
......
3210 3210
    bitstream_filters[nb_output_files][oc->nb_streams - 1]= audio_bitstream_filters;
3211 3211
    audio_bitstream_filters= NULL;
3212 3212

  
3213
        avcodec_thread_init(st->codec, thread_count);
3213
    avcodec_thread_init(st->codec, thread_count);
3214 3214

  
3215 3215
    audio_enc = st->codec;
3216 3216
    audio_enc->codec_type = CODEC_TYPE_AUDIO;
ffplay.c
1722 1722
    enc->skip_loop_filter= skip_loop_filter;
1723 1723
    enc->error_recognition= error_recognition;
1724 1724
    enc->error_concealment= error_concealment;
1725
        avcodec_thread_init(enc, thread_count);
1725
    avcodec_thread_init(enc, thread_count);
1726 1726

  
1727 1727
    set_context_opts(enc, avcodec_opts[enc->codec_type], 0);
1728 1728

  

Also available in: Unified diff