summaryrefslogtreecommitdiff
path: root/libavcodec/4xm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-22 03:41:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-22 03:41:55 +0100
commit5ffb5e7a2d69f5e4bece9829ede0432b4cbc0fe8 (patch)
tree680c3bbc365065ae5ff7d3fad526df06c65b9a7d /libavcodec/4xm.c
parent44fe118e0a5fc4797ee49e1ce56108bde13f19dc (diff)
4xm: check the correct stream, fix fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/4xm.c')
-rw-r--r--libavcodec/4xm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 2c2bc56b49..05bc280067 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -378,19 +378,19 @@ static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src,
av_log(f->avctx, AV_LOG_ERROR, "mv out of pic\n");
return;
}
- if (bytestream2_get_bytes_left(&f->g) < 2){
+ if (bytestream2_get_bytes_left(&f->g2) < 2){
av_log(f->avctx, AV_LOG_ERROR, "wordstream overread\n");
return;
}
mcdc(dst, src, log2w, h, stride, 1, bytestream2_get_le16u(&f->g2));
} else if (code == 5) {
- if (bytestream2_get_bytes_left(&f->g) < 2) {
+ if (bytestream2_get_bytes_left(&f->g2) < 2) {
av_log(f->avctx, AV_LOG_ERROR, "wordstream overread\n");
return;
}
mcdc(dst, src, log2w, h, stride, 0, bytestream2_get_le16u(&f->g2));
} else if (code == 6) {
- if (bytestream2_get_bytes_left(&f->g) < 4) {
+ if (bytestream2_get_bytes_left(&f->g2) < 4) {
av_log(f->avctx, AV_LOG_ERROR, "wordstream overread\n");
return;
}