asfdec: ignore stored duration for truncated files

[ffmpeg] / libavcodec / msrle.c

diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index 7c965d25e2a4534f75dd3b45d2d5d5d88fdbe025..2792f8b00418d8cebf1bdaba9de3c990e7107138 100644 (file)
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -56,14 +56,14 @@ static av_cold int msrle_decode_init(AVCodecContext *avctx)
 
     switch (avctx->bits_per_coded_sample) {
     case 1:
-        avctx->pix_fmt = PIX_FMT_MONOWHITE;
+        avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
         break;
     case 4:
     case 8:
-        avctx->pix_fmt = PIX_FMT_PAL8;
+        avctx->pix_fmt = AV_PIX_FMT_PAL8;
         break;
     case 24:
-        avctx->pix_fmt = PIX_FMT_BGR24;
+        avctx->pix_fmt = AV_PIX_FMT_BGR24;
         break;
     default:
         av_log(avctx, AV_LOG_ERROR, "unsupported bits per sample\n");
@@ -75,7 +75,7 @@ static av_cold int msrle_decode_init(AVCodecContext *avctx)
 
     if (avctx->extradata_size >= AVPALETTE_SIZE)
         for (i = 0; i < AVPALETTE_SIZE/4; i++)
-            s->pal[i] = 0xFF<<24 | AV_RL32(avctx->extradata+4*i);
+            s->pal[i] = 0xFFU<<24 | AV_RL32(avctx->extradata+4*i);
 
     return 0;
 }