Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / img2.c

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 8adba0ac5fdd8fe06d26cc82baa5b27ac7d4fdb1..18b9cde230d72ff84a01834b13a8cc1a3ae1e7f3 100644 (file)
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -205,13 +205,7 @@ enum CodecID ff_guess_image2_codec(const char *filename)
     return av_str2id(img_tags, filename);
 }
 
-#if FF_API_GUESS_IMG2_CODEC
-enum CodecID av_guess_image2_codec(const char *filename){
-    return av_str2id(img_tags, filename);
-}
-#endif
-
-static int read_header(AVFormatContext *s1, AVFormatParameters *ap)
+static int read_header(AVFormatContext *s1)
 {
     VideoData *s = s1->priv_data;
     int first_index, last_index, ret = 0;
@@ -240,11 +234,6 @@ static int read_header(AVFormatContext *s1, AVFormatParameters *ap)
         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;