avformat/mpegts: Add missing constants for MPEG-TS stream_id definitions

[ffmpeg] / libavcodec / frame_thread_encoder.c

diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
index c6323b6246b215f86aafb61f8c22b6a60997e135..778317d60bbb479b238a24b6b06b98759e0eabf8 100644 (file)
--- a/libavcodec/frame_thread_encoder.c
+++ b/libavcodec/frame_thread_encoder.c
@@ -40,7 +40,7 @@
 typedef struct{
     AVFrame  *indata;
     AVPacket *outdata;
-    int64_t return_code;
+    int       return_code;
     int       finished;
 } Task;
 
@@ -305,6 +305,7 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     while (!outtask->finished) {
         pthread_cond_wait(&c->finished_task_cond, &c->finished_task_mutex);
     }
+    pthread_mutex_unlock(&c->finished_task_mutex);
     /* We now own outtask completely: No worker thread touches it any more,
      * because there is no outstanding task with this index. */
     outtask->finished = 0;
@@ -312,7 +313,6 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     if(pkt->data)
         *got_packet_ptr = 1;
     c->finished_task_index = (c->finished_task_index + 1) % c->max_tasks;
-    pthread_mutex_unlock(&c->finished_task_mutex);
 
     return outtask->return_code;
 }