Revision 043d2ff2 libavcodec/pthread.c

View differences:

libavcodec/pthread.c
256 256 
        if(pthread_create(&c->workers[i], NULL, worker, avctx)) {
257 257 
           avctx->thread_count = i;
258 258 
           pthread_mutex_unlock(&c->current_job_lock);
259 
           avcodec_thread_free(avctx);
259 
           ff_thread_free(avctx);
260 260 
           return -1;
261 261 
        }
262 262 
    }
......
870 870 
    }
871 871 
}
872 872 

  		




  873
  
  
    
int avcodec_thread_init(AVCodecContext *avctx, int thread_count)


  		




  
  873
  
    
int ff_thread_init(AVCodecContext *avctx, int thread_count)


  		




  874
  874
  
    
{


  		




  875
  875
  
    
    if (avctx->thread_opaque) {


  		




  876
  876
  
    
        av_log(avctx, AV_LOG_ERROR, "avcodec_thread_init is ignored after avcodec_open\n");


  		




  ......




  891
  891
  
    
    return 0;


  		




  892
  892
  
    
}


  		




  893
  893
  
    

  		




  894
  
  
    
void avcodec_thread_free(AVCodecContext *avctx)


  		




  
  894
  
    
void ff_thread_free(AVCodecContext *avctx)


  		




  895
  895
  
    
{


  		




  896
  896
  
    
    if (avctx->active_thread_type&FF_THREAD_FRAME)


  		




  897
  897
  
    
        frame_thread_free(avctx, avctx->thread_count);


  		












Also available in:  Unified diff