OSDN Git Service

img2dec: remove GLOB_TILDE support.
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Mar 2012 22:35:01 +0000 (00:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Mar 2012 03:16:15 +0000 (05:16 +0200)
tilde expansion should/can be done by the shell

Reviewed-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/img2dec.c

index 155f9fc..3579d3b 100644 (file)
 #ifndef GLOB_NOMAGIC
 #define GLOB_NOMAGIC 0
 #endif
-#ifndef GLOB_TILDE
-#define GLOB_TILDE 0
-#endif
-#ifndef GLOB_TILDE_CHECK
-#define GLOB_TILDE_CHECK GLOB_TILDE
-#endif
 #ifndef GLOB_BRACE
 #define GLOB_BRACE 0
 #endif
@@ -249,7 +243,7 @@ static int read_header(AVFormatContext *s1)
             *p = 0;
             av_free(dup);
 
-            gerr = glob(s->path, GLOB_NOCHECK|GLOB_BRACE|GLOB_NOMAGIC|GLOB_TILDE_CHECK, NULL, &s->globstate);
+            gerr = glob(s->path, GLOB_NOCHECK|GLOB_BRACE|GLOB_NOMAGIC, NULL, &s->globstate);
             if (gerr != 0) {
                 return AVERROR(ENOENT);
             }