pthread: Avoid spurious wakeups

[ffmpeg] / libavcodec / xl.c

diff --git a/libavcodec/xl.c b/libavcodec/xl.c
index 03df7c3eab94e76895d5f04061cc5bbc94590420..8e9bdc66f60b6c13acd84b274542b85bd1904c4d 100644 (file)
--- a/libavcodec/xl.c
+++ b/libavcodec/xl.c
@@ -49,7 +49,12 @@ static int decode_frame(AVCodecContext *avctx,
     uint32_t val;
     int y0, y1, y2, y3 = 0, c0 = 0, c1 = 0;
 
-    if (buf_size < avctx->width * avctx->height * sizeof(int32_t)) {
+    if (avctx->width % 4) {
+        av_log(avctx, AV_LOG_ERROR, "Width not a multiple of 4.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    if (buf_size < avctx->width * avctx->height) {
         av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
         return AVERROR_INVALIDDATA;
     }
@@ -127,10 +132,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
 
 AVCodec ff_xl_decoder = {
     .name         = "xl",
+    .long_name    = NULL_IF_CONFIG_SMALL("Miro VideoXL"),
     .type         = AVMEDIA_TYPE_VIDEO,
     .id           = AV_CODEC_ID_VIXL,
     .init         = decode_init,
     .decode       = decode_frame,
     .capabilities = CODEC_CAP_DR1,
-    .long_name    = NULL_IF_CONFIG_SMALL("Miro VideoXL"),
 };