aiff: don't skip block_align==0 check on COMM-after-SSND files.

[ffmpeg] / libavformat / img2.c

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 4ff47670a5db8fd1f610b3983b2e9fa25421da31..d7a749cde5ea9e5de7a451b895c3eea496604096 100644 (file)
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -228,11 +228,6 @@ static int read_header(AVFormatContext *s1)
         return ret;
     }
 
-#if FF_API_LOOP_INPUT
-    if (s1->loop_input)
-        s->loop = s1->loop_input;
-#endif
-
     av_strlcpy(s->path, s1->filename, sizeof(s->path));
     s->img_number = 0;
     s->img_count = 0;
@@ -496,7 +491,8 @@ AVOutputFormat ff_image2_muxer = {
     .name           = "image2",
     .long_name      = NULL_IF_CONFIG_SMALL("image2 sequence"),
     .extensions     = "bmp,dpx,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
-                      "ppm,sgi,tga,tif,tiff,jp2,xwd",
+                      "ppm,sgi,tga,tif,tiff,jp2,xwd,sun,ras,rs,im1,im8,im24,"
+                      "sunras",
     .priv_data_size = sizeof(VideoData),
     .video_codec    = CODEC_ID_MJPEG,
     .write_header   = write_header,