indent

[ffmpeg] / libavformat / img2.c

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 1e7bcc69921ab3dae326dc44900c578034abf4b8..2e570dd87f3f992c93b9400796640e8f5674f07d 100644 (file)
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -303,11 +303,6 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
     }
 }
 
-static int img_read_close(AVFormatContext *s1)
-{
-    return 0;
-}
-
 #ifdef CONFIG_MUXERS
 /******************************************************/
 /* image output */
@@ -379,12 +374,12 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
 #ifdef CONFIG_IMAGE2_DEMUXER
 AVInputFormat image2_demuxer = {
     "image2",
-    "image2 sequence",
+    NULL_IF_CONFIG_SMALL("image2 sequence"),
     sizeof(VideoData),
     image_probe,
     img_read_header,
     img_read_packet,
-    img_read_close,
+    NULL,
     NULL,
     NULL,
     AVFMT_NOFILE,
@@ -393,13 +388,11 @@ AVInputFormat image2_demuxer = {
 #ifdef CONFIG_IMAGE2PIPE_DEMUXER
 AVInputFormat image2pipe_demuxer = {
     "image2pipe",
-    "piped image2 sequence",
+    NULL_IF_CONFIG_SMALL("piped image2 sequence"),
     sizeof(VideoData),
     NULL, /* no probe */
     img_read_header,
     img_read_packet,
-    img_read_close,
-    NULL,
 };
 #endif
 
@@ -407,7 +400,7 @@ AVInputFormat image2pipe_demuxer = {
 #ifdef CONFIG_IMAGE2_MUXER
 AVOutputFormat image2_muxer = {
     "image2",
-    "image2 sequence",
+    NULL_IF_CONFIG_SMALL("image2 sequence"),
     "",
     "",
     sizeof(VideoData),
@@ -422,7 +415,7 @@ AVOutputFormat image2_muxer = {
 #ifdef CONFIG_IMAGE2PIPE_MUXER
 AVOutputFormat image2pipe_muxer = {
     "image2pipe",
-    "piped image2 sequence",
+    NULL_IF_CONFIG_SMALL("piped image2 sequence"),
     "",
     "",
     sizeof(VideoData),