diff options
Diffstat (limited to 'pkg/ffmpeg')
| -rw-r--r-- | pkg/ffmpeg/gen.lua | 2 | ||||
| -rw-r--r-- | pkg/ffmpeg/list.lua | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua index 84c04056..35133aa1 100644 --- a/pkg/ffmpeg/gen.lua +++ b/pkg/ffmpeg/gen.lua @@ -46,7 +46,7 @@ build('awk', '$outdir/include/libavutil/avconfig.h', {'$dir/options.h', '|', '$d expr='-f $dir/avconfig.awk', }) -rule('genlist', 'lua5.2 $dir/list.lua $dir/options.h $type $var <$in >$out') +rule('genlist', 'lua $dir/list.lua $dir/options.h $type $var <$in >$out') local function genlist(out, src, type, var) build('genlist', out, {src, '|', '$dir/list.lua', '$dir/options.h'}, {type=type, var=var}) table.insert(pkg.deps, out) diff --git a/pkg/ffmpeg/list.lua b/pkg/ffmpeg/list.lua index 66cfbcda..c75cd700 100644 --- a/pkg/ffmpeg/list.lua +++ b/pkg/ffmpeg/list.lua @@ -4,7 +4,7 @@ local var = arg[3] local options = {} for line in io.lines(optionshdr) do - local cfg, val = line:match('^#define CONFIG_(%g+) (%g+)$') + local cfg, val = line:match('^#define CONFIG_([%w_]+) (%d)$') if cfg then options[cfg] = val == '1' end @@ -12,7 +12,7 @@ end print('static const '..type..' *const '..var..'[] = {') for line in io.lines() do - local name = line:match('^extern .*'..type..' +ff_(%g+);$') + local name = line:match('^extern .*'..type..' +ff_([%w_]+);$') if name then local cfg if var == 'filter_list' then |