diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-29 15:56:12 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-05-01 23:30:04 +0200 |
| commit | a5f8417db587f54daae0340fc88f684cb41d020c (patch) | |
| tree | 7db38e9c0e8d4314bbb1eac644557e578bf7e654 | |
| parent | 1f0c92d68bab52c852fda5a5669def27a57eaa97 (diff) | |
| download | ffmpeg-a5f8417db587f54daae0340fc88f684cb41d020c.tar.gz | |
xbmdec: fix decoding when variable name contains an 'x'.
Fixes trac ticket #1142.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
| -rw-r--r-- | libavcodec/xbmdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c index 629a636e6a..b3e4cf2f89 100644 --- a/libavcodec/xbmdec.c +++ b/libavcodec/xbmdec.c @@ -83,6 +83,9 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data, if ((ret = avctx->get_buffer(avctx, p)) < 0) return ret; + // goto start of image data + ptr += strcspn(ptr, "{") + 1; + linesize = (avctx->width + 7) / 8; for (i = 0; i < avctx->height; i++) { dst = p->data[0] + i * p->linesize[0]; |