Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / mjpegenc.c

diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index 228b616f6583da7031fc754bcfa30b20402d0f72..4e77e0d659dcd6963eb42bc28c3b0abcf95e72a0 100644 (file)
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -490,5 +490,6 @@ AVCodec ff_amv_encoder = {
     .init           = MPV_encode_init,
     .encode         = amv_encode_picture,
     .close          = MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, -1},
+    .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE},
+    .long_name      = NULL_IF_CONFIG_SMALL("AMV Video"),
 };