[FFmpeg-cvslog] libavformat/img2dec: fix warning when !HAVE_GLOB

Christophe Gisquet git at videolan.org
Wed Jan 21 21:57:26 CET 2015


ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet at gmail.com> | Tue Jan 20 22:03:18 2015 +0100| [9a9b088d9e2d054aa9467baacc61fc247818c7bf] | committer: Michael Niedermayer

libavformat/img2dec: fix warning when !HAVE_GLOB

Variables are unused in this case.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a9b088d9e2d054aa9467baacc61fc247818c7bf
---

 libavformat/img2dec.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 329e61d..68cbefd 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -227,8 +227,10 @@ int ff_img_read_header(AVFormatContext *s1)
         if (s->pattern_type == PT_GLOB_SEQUENCE) {
         s->use_glob = is_glob(s->path);
         if (s->use_glob) {
+#if HAVE_GLOB
             char *p = s->path, *q, *dup;
             int gerr;
+#endif
 
             av_log(s1, AV_LOG_WARNING, "Pattern type 'glob_sequence' is deprecated: "
                    "use pattern_type 'glob' instead\n");
@@ -494,8 +496,8 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
 
 static int img_read_close(struct AVFormatContext* s1)
 {
-    VideoDemuxData *s = s1->priv_data;
 #if HAVE_GLOB
+    VideoDemuxData *s = s1->priv_data;
     if (s->use_glob) {
         globfree(&s->globstate);
     }



More information about the ffmpeg-cvslog mailing list