Merge commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8'

* commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8': wnv1: Make sure the input packet is large enough Conflicts: libavcodec/wnv1.c See: f23a2418fb Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 621845fecc
parent 341dc59053 91be1103fd
commit 621845fecc
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@ -68,8 +68,8 @@ static int decode_frame(AVCodecContext *avctx,
    int prev_y = 0, prev_u = 0, prev_v = 0;
    uint8_t *rbuf;

-    if(buf_size<=8) {
-        av_log(avctx, AV_LOG_ERROR, "buf_size %d is too small\n", buf_size);
+    if (buf_size <= 8) {
+        av_log(avctx, AV_LOG_ERROR, "Packet size %d is too small\n", buf_size);
        return AVERROR_INVALIDDATA;
    }