[FFmpeg-devel] [PATCH 3/3] avformat/img2dec: remove special case for custom io contexts

Michael Niedermayer michaelni at gmx.at
Tue Apr 21 13:22:02 CEST 2015


its not needed anymore

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavformat/img2dec.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 5fc5b83..5da06b7 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -341,10 +341,8 @@ int ff_img_read_header(AVFormatContext *s1)
                     break;
                 }
             }
-            if (s1->flags & AVFMT_FLAG_CUSTOM_IO) {
-                avio_seek(s1->pb, 0, SEEK_SET);
-            } else
-                ffio_rewind_with_probe_data(s1->pb, &probe_buffer, probe_buffer_size);
+
+            ffio_rewind_with_probe_data(s1->pb, &probe_buffer, probe_buffer_size);
         }
         if (st->codec->codec_id == AV_CODEC_ID_NONE)
             st->codec->codec_id = ff_guess_image2_codec(s->path);
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list