diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 23:48:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 23:48:48 +0100 |
| commit | 61904467458b16cf89530e2d0875f3786001dc11 (patch) | |
| tree | b87f0d285f00a0f580246dbc0c915d678e1cda49 /libavcodec/ansi.c | |
| parent | a2aeaff40f34cb54bef55240f9cb8046385087d7 (diff) | |
| parent | e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355 (diff) | |
| download | ffmpeg-61904467458b16cf89530e2d0875f3786001dc11.tar.gz | |
Merge commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355'
* commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355':
avs: return meaningful error codes.
aura: return meaningful error codes.
asvdec: return meaningful error codes.
ansi: return a meaningful error code
anm: return meaningful error codes
aasc: return meaningful error codes.
8bps: return meaningful error codes.
4xm: operate with pointers to AVFrames instead of whole structs.
4xm: eliminate a pointless indirection
Conflicts:
libavcodec/4xm.c
libavcodec/aasc.c
libavcodec/anm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ansi.c')
| -rw-r--r-- | libavcodec/ansi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index e705da6281..51339d24f9 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -434,8 +434,8 @@ static int decode_frame(AVCodecContext *avctx, 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] >= 0) s->nb_args++; - if (execute_code(avctx, buf[0]) < 0) - return -1; + if ((ret = execute_code(avctx, buf[0])) < 0) + return ret; s->state = STATE_NORMAL; } break; |