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>

libavcodec/wnv1.c

@@ -69,7 +69,7 @@ static int decode_frame(AVCodecContext *avctx,
     uint8_t *rbuf;
 
     if (buf_size <= 8) {
-        av_log(avctx, AV_LOG_ERROR, "buf_size %d is too small\n", buf_size);
+        av_log(avctx, AV_LOG_ERROR, "Packet size %d is too small\n", buf_size);
         return AVERROR_INVALIDDATA;
     }