Loop up to MAX_THREADS instead of h->s.avctx->thread_count to free the thread

[ffmpeg] / libavcodec / faxcompr.c

diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index b727284642459bf0a73ba91c69c949039e147a15..087197e97c71871ba9391b9941f5467aee882b51 100644 (file)
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -21,7 +21,7 @@
 
 /**
  * CCITT Fax Group 3 and 4 decompression
- * @file faxcompr.c
+ * @file libavcodec/faxcompr.c
  * @author Konstantin Shishkov
  */
 #include "avcodec.h"
@@ -95,7 +95,7 @@ static const uint8_t ccitt_group3_2d_lens[11] = {
 
 static VLC ccitt_vlc[2], ccitt_group3_2d_vlc;
 
-av_cold void ff_ccitt_unpack_init()
+av_cold void ff_ccitt_unpack_init(void)
 {
     static VLC_TYPE code_table1[528][2];
     static VLC_TYPE code_table2[648][2];
@@ -123,9 +123,10 @@ av_cold void ff_ccitt_unpack_init()
 
 
 static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
-                                 int pix_left, int *runs, const int *runend)
+                                 unsigned int pix_left, int *runs, const int *runend)
 {
-    int mode = 0, run = 0;
+    int mode = 0;
+    unsigned int run=0;
     unsigned int t;
     for(;;){
         t = get_vlc2(gb, ccitt_vlc[mode].table, 9, 2);
@@ -136,14 +137,13 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
                 av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
                 return -1;
             }
-            pix_left -= run;
-            if(pix_left <= 0){
-                if(!pix_left)
+            if(pix_left <= run){
+                if(pix_left == run)
                     break;
-                runs[-1] += pix_left;
                 av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
                 return -1;
             }
+            pix_left -= run;
             run = 0;
             mode = !mode;
         }else if((int)t == -1){
@@ -156,11 +156,11 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
 }
 
 static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
-                                 int width, int *runs, const int *runend, const int *ref)
+                                 unsigned int width, int *runs, const int *runend, const int *ref)
 {
-    int mode = 0, offs = 0, run = 0, saved_run = 0, t;
+    int mode = 0, saved_run = 0, t;
     int run_off = *ref++;
-    int *run_start = runs;
+    unsigned int offs=0, run= 0;
 
     runend--; // for the last written 0
 
@@ -173,8 +173,8 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
         if(!cmode){//pass mode
             run_off += *ref++;
             run = run_off - offs;
+            offs= run_off;
             run_off += *ref++;
-            offs += run;
             if(offs > width){
                 av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
                 return -1;
@@ -201,7 +201,7 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
                 }
                 saved_run = 0;
                 offs += run;
-                if(offs > width){
+                if(offs > width || run > width){
                     av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
                     return -1;
                 }
@@ -212,12 +212,9 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
             return -1;
         }else{//vertical mode
             run = run_off - offs + (cmode - 5);
-            if(cmode >= 5)
-                run_off += *ref++;
-            else
-                run_off -= *--ref;
+            run_off -= *--ref;
             offs += run;
-            if(offs > width){
+            if(offs > width || run > width){
                 av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
                 return -1;
             }