diff options
| author | Peter Ross <pross@xvid.org> | 2012-09-01 15:15:45 +1000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-01 15:22:34 +0200 |
| commit | 95b9e56bebc2c92878a21fc37f5b44d7e4ba05ef (patch) | |
| tree | 797c33d076705cbb9a7fe068598bf54d13ca2663 /libavcodec/ansi.c | |
| parent | 368a768cbcbf9320fcd8cf6c2ecb7f6904837a95 (diff) | |
| download | ffmpeg-95b9e56bebc2c92878a21fc37f5b44d7e4ba05ef.tar.gz | |
ansi: support escaped codes where last argument is zero
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ansi.c')
| -rw-r--r-- | libavcodec/ansi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index 3f06fa4fb3..3cfc3af801 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -368,7 +368,7 @@ static int decode_frame(AVCodecContext *avctx, if (buf[0] == '[') { s->state = STATE_CODE; s->nb_args = 0; - s->args[0] = 0; + s->args[0] = -1; } else { s->state = STATE_NORMAL; draw_char(avctx, 0x1B); @@ -380,7 +380,7 @@ static int decode_frame(AVCodecContext *avctx, case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': if (s->nb_args < MAX_NB_ARGS) - s->args[s->nb_args] = s->args[s->nb_args] * 10 + buf[0] - '0'; + s->args[s->nb_args] = FFMAX(s->args[s->nb_args], 0) * 10 + buf[0] - '0'; break; case ';': s->nb_args++; @@ -396,7 +396,7 @@ static int decode_frame(AVCodecContext *avctx, default: if (s->nb_args > MAX_NB_ARGS) av_log(avctx, AV_LOG_WARNING, "args overflow (%i)\n", s->nb_args); - if (s->nb_args < MAX_NB_ARGS && s->args[s->nb_args]) + if (s->nb_args < MAX_NB_ARGS && s->args[s->nb_args] >= 0) s->nb_args++; if (execute_code(avctx, buf[0]) < 0) return -1; |