diff --git a/ffmpeg.c b/ffmpeg.c index 7769bbfece..b9397dbdf6 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2019,7 +2019,7 @@ static void opt_format(const char *arg) /* compatibility stuff for pgmyuv */ if (!strcmp(arg, "pgmyuv")) { pgmyuv_compatibility_hack=1; - opt_image_format(arg); +// opt_image_format(arg); arg = "image2"; } diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d1fc72a949..c91c55cfa3 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -113,17 +113,21 @@ void av_register_all(void) #ifdef CONFIG_ENCODERS /* image formats */ +#if 0 av_register_image_format(&pnm_image_format); av_register_image_format(&pbm_image_format); av_register_image_format(&pgm_image_format); av_register_image_format(&ppm_image_format); av_register_image_format(&pam_image_format); av_register_image_format(&pgmyuv_image_format); +#endif av_register_image_format(&yuv_image_format); +#if 0 #ifdef CONFIG_ZLIB av_register_image_format(&png_image_format); #endif av_register_image_format(&jpeg_image_format); +#endif av_register_image_format(&gif_image_format); av_register_image_format(&sgi_image_format); #endif //CONFIG_ENCODERS