Initialize s->opaque before calling url_resetbuf().

[ffmpeg] / libavcodec / pnmenc.c

diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c
index 7ea286a878f96fd4cb1c6ca3f04cddc1530c8e5b..b62ea759dffcf27a1c52ada31720108103f39fa4 100644 (file)
--- a/libavcodec/pnmenc.c
+++ b/libavcodec/pnmenc.c
@@ -365,7 +365,7 @@ AVCodec pgm_encoder = {
     NULL, //encode_end,
     pnm_decode_frame,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE},
-    .long_name= "PGM (Portable GrayMap) image",
+    .long_name= NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"),
 };
 #endif // CONFIG_PGM_ENCODER
 
@@ -380,7 +380,7 @@ AVCodec pgmyuv_encoder = {
     NULL, //encode_end,
     pnm_decode_frame,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "PGMYUV (Portable GrayMap YUV) image",
+    .long_name= NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"),
 };
 #endif // CONFIG_PGMYUV_ENCODER
 
@@ -395,7 +395,7 @@ AVCodec ppm_encoder = {
     NULL, //encode_end,
     pnm_decode_frame,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_NONE},
-    .long_name= "PPM (Portable PixelMap) image",
+    .long_name= NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"),
 };
 #endif // CONFIG_PPM_ENCODER
 
@@ -410,7 +410,7 @@ AVCodec pbm_encoder = {
     NULL, //encode_end,
     pnm_decode_frame,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE},
-    .long_name= "PBM (Portable BitMap) image",
+    .long_name= NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"),
 };
 #endif // CONFIG_PBM_ENCODER
 
@@ -425,6 +425,6 @@ AVCodec pam_encoder = {
     NULL, //encode_end,
     pnm_decode_frame,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE},
-    .long_name= "PAM (Portable AnyMap) image",
+    .long_name= NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
 };
 #endif // CONFIG_PAM_ENCODER