[FFmpeg-cvslog] img2dec: remove GLOB_TILDE support.

Michael Niedermayer git at videolan.org
Fri Mar 30 05:21:13 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 30 00:35:01 2012 +0200| [d3d5e84f33496f7c6ed704d53998db97a69f02e8] | committer: Michael Niedermayer

img2dec: remove GLOB_TILDE support.

tilde expansion should/can be done by the shell

Reviewed-by: Alexander Strasser <eclipse7 at gmx.net>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/img2dec.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 155f9fc..3579d3b 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -35,12 +35,6 @@
 #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);
             }



More information about the ffmpeg-cvslog mailing list