[FFmpeg-cvslog] avcodec/cfhd: Fix decoding regression due to height check

[Vodyannikov Aleksandr]

ffmpeg | branch: release/3.0 | Vodyannikov Aleksandr <Aleksoid1978 at mail.ru> | Fri Jul 21 11:49:45 2017 +0200| [8642322b9f2325fd088bbb6d869ff15fb514ce55] | committer: Michael Niedermayer

avcodec/cfhd: Fix decoding regression due to height check

Fixes: Ticket6546

Regression since: 54aaadf648073149f1ac34f56cbde4e6c5aa22ef

Reviewed-by: Muhammad Faiz <mfcc64 at gmail.com>
Reviewed-by: Kieran Kunhya <kierank at obe.tv>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 47c93657249f1a4bc8a7aaf2f9f3a33510bee38c)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/cfhd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index b14de9ec04..685090eb61 100644
--- a/libavcodec/cfhd.c
+++ b/libavcodec/cfhd.c
@@ -324,7 +324,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
             s->plane[s->channel_num].band[0][0].stride = data;
         } else if (tag == 28) {
             av_log(avctx, AV_LOG_DEBUG, "Lowpass height %"PRIu16"\n", data);
-            if (data < 3 || data > s->plane[s->channel_num].band[0][0].height) {
+            if (data < 3 || data > s->plane[s->channel_num].band[0][0].a_height) {
                 av_log(avctx, AV_LOG_ERROR, "Invalid lowpass height\n");
                 ret = AVERROR(EINVAL);
                 break;