Merge 76138 - Properly account the thread index on all exit paths from the fu...

source/patched-ffmpeg-mt/libavcodec/pthread.c

 /*
  * Copyright (c) 2004 Roman Shaposhnik
  * Copyright (c) 2008 Alexander Strange (astrange@ithinksw.com)
  *
  * Many thanks to Steven M. Schultz for providing clever ideas and
  * to Michael Niedermayer <michaelni@gmx.at> for writing initial
  * implementation.
  *
  * This file is part of FFmpeg.
  *
@@ skipping 430 matching lines @@
     int thread_count = avctx->thread_count, err = 0;
     int returning_thread = fctx->next_finished;
     PerThreadContext *p;
 
     p = &fctx->threads[fctx->next_decoding];
     update_thread_context_from_user(p->avctx, avctx);
     err = submit_frame(p, avpkt);
     if (err) return err;
 
     fctx->next_decoding++;
+    int decoding_save = fctx->next_decoding;
+    if (fctx->next_decoding >= thread_count) fctx->next_decoding = 0;
 
     if (fctx->delaying && avpkt->size) {
-        if (fctx->next_decoding >= (thread_count-1)) fctx->delaying = 0;
+        if (decoding_save >= (thread_count-1)) fctx->delaying = 0;
 
         *got_picture_ptr=0;
         return 0;
     }
 
     //If it's draining frames at EOF, ignore null frames from the codec.
     //Only return one when we've run out of codec frames to return.
     do {
         p = &fctx->threads[returning_thread++];
 
         if (p->state != STATE_INPUT_READY) {
             pthread_mutex_lock(&p->progress_mutex);
             while (p->state != STATE_INPUT_READY)
                 pthread_cond_wait(&p->output_cond, &p->progress_mutex);
             pthread_mutex_unlock(&p->progress_mutex);
         }
 
         *picture = p->picture;
         *got_picture_ptr = p->got_picture;
 
         avcodec_get_frame_defaults(&p->picture);
         p->got_picture = 0;
 
         if (returning_thread >= thread_count) returning_thread = 0;
     } while (!avpkt->size && !*got_picture_ptr && returning_thread != fctx->next_finished);
 
     update_thread_context_from_copy(avctx, p->avctx, 1);
 
-    if (fctx->next_decoding >= thread_count) fctx->next_decoding = 0;
     fctx->next_finished = returning_thread;
 
     return p->result;
 }
 
 void ff_thread_report_progress(AVFrame *f, int n, int field)
 {
     PerThreadContext *p;
     int *progress = f->thread_opaque;
 
@@ skipping 299 matching lines @@
     return 0;
 }
 
 void avcodec_thread_free(AVCodecContext *avctx)
 {
     if (avctx->active_thread_type&FF_THREAD_FRAME)
         frame_thread_free(avctx, avctx->thread_count);
     else
         thread_free(avctx);
 }