Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

[ffmpeg] / libavcodec / avuidec.c

diff --git a/libavcodec/avuidec.c b/libavcodec/avuidec.c
index ba07a58f2816f7626ffd331487849dc9a510b700..52d809010924791cb6af0c8afd492710743f8c1f 100644 (file)
--- a/libavcodec/avuidec.c
+++ b/libavcodec/avuidec.c
@@ -25,7 +25,7 @@
 
 static av_cold int avui_decode_init(AVCodecContext *avctx)
 {
-    avctx->pix_fmt = PIX_FMT_YUVA422P;
+    avctx->pix_fmt = AV_PIX_FMT_YUVA422P;
 
     avctx->coded_frame = avcodec_alloc_frame();
 
@@ -151,5 +151,5 @@ AVCodec ff_avui_decoder = {
     .decode       = avui_decode_frame,
     .close        = avui_decode_close,
     .capabilities = CODEC_CAP_DR1,
-    .long_name    = NULL_IF_CONFIG_SMALL("AVID Meridien"),
+    .long_name    = NULL_IF_CONFIG_SMALL("Avid Meridien Uncompressed"),
 };