summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-14 00:30:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-14 00:31:18 +0100
commit56d09250ef44eebd04f6d4cf6c6f5bfbe46b01dc (patch)
tree243e84ef24e7bdf8181223c63d461efadccb9685 /libavcodec
parent2947e7b7a7378e4899c57a86f029fb20dc0f010c (diff)
nuv: dont try to copy an empty frame
Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/nuv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index 67c9c0f9fb..ff11d007c4 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -262,7 +262,8 @@ retry:
av_log(avctx, AV_LOG_ERROR, "uncompressed frame too short\n");
height = buf_size / c->width / 3 * 2;
}
- copy_frame(&c->pic, buf, c->width, height);
+ if(height > 0)
+ copy_frame(&c->pic, buf, c->width, height);
break;
}
case NUV_RTJPEG_IN_LZO: