diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-12-26 16:57:35 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-12-26 16:57:35 +0000 |
| commit | 43ba8f3545dd530d21ae08cac4489a20a777d03b (patch) | |
| tree | 842869f255701835f62e27824464891e1295f753 /libavcodec/faxcompr.c | |
| parent | a3636fa033ac19226fee52a616141bc5e5ff9fde (diff) | |
Get rid of pix_left in the 2d code, it is simpler that way.
Originally committed as revision 16339 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/faxcompr.c')
| -rw-r--r-- | libavcodec/faxcompr.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index c01a1ef752..4ce615390b 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -156,7 +156,7 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb, } static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb, - int pix_left, int *runs, const int *runend, const int *ref) + int width, int *runs, const int *runend, const int *ref) { int mode = 0, offs = 0, run = 0, saved_run = 0, t; int run_off = *ref++; @@ -164,7 +164,7 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb, runend--; // for the last written 0 - while(pix_left > 0){ + while(offs < width){ int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1); if(cmode == -1){ av_log(avctx, AV_LOG_ERROR, "Incorrect mode VLC\n"); @@ -179,12 +179,11 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb, run_off += *ref++; run = run_off - offs; run_off += *ref++; - pix_left -= run; - if(pix_left < 0){ + offs += run; + if(offs > width){ av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n"); return -1; } - offs += run; saved_run += run; }else if(cmode == 1){//horizontal mode int k; @@ -206,12 +205,11 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb, return -1; } saved_run = 0; - pix_left -= run; - if(pix_left < 0){ + offs += run; + if(offs > width){ av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n"); return -1; } - offs += run; mode = !mode; } }else if(cmode == 9 || cmode == 10){ @@ -223,12 +221,11 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb, run_off += *ref++; else run_off -= *--ref; - pix_left -= run; - if(pix_left < 0){ + offs += run; + if(offs > width){ av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n"); return -1; } - offs += run; *runs++ = run + saved_run; if(runs >= runend){ av_log(avctx, AV_LOG_ERROR, "Run overrun\n"); |