summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-04-29 15:56:12 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-05-01 23:30:04 +0200
commita5f8417db587f54daae0340fc88f684cb41d020c (patch)
tree7db38e9c0e8d4314bbb1eac644557e578bf7e654 /libavcodec
parent1f0c92d68bab52c852fda5a5669def27a57eaa97 (diff)
downloadffmpeg-streaming-a5f8417db587f54daae0340fc88f684cb41d020c.zip
ffmpeg-streaming-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>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/xbmdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c
index 629a636..b3e4cf2 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];
OpenPOWER on IntegriCloud