[FFmpeg-cvslog] 4xm: check the correct stream, fix fate

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 22 03:41:12 2012 +0100| [5ffb5e7a2d69f5e4bece9829ede0432b4cbc0fe8] | committer: Michael Niedermayer

4xm: check the correct stream, fix fate

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ffb5e7a2d69f5e4bece9829ede0432b4cbc0fe8
---

 libavcodec/4xm.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 2c2bc56..05bc280 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;
         }