diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 14:38:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 14:46:13 +0200 |
| commit | 82c0055c5e71f2289936e6c2528bed5826c18c43 (patch) | |
| tree | e4510e6a8cf751182378f293f7a8bc4f253c0097 /libavutil/eval.c | |
| parent | db51c65961bd692fc6ebb12c2f4183699d3db9c0 (diff) | |
| parent | b5198a2637b7b45b0049a1d4b386a06f016f2520 (diff) | |
| download | ffmpeg-82c0055c5e71f2289936e6c2528bed5826c18c43.tar.gz | |
Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'
* commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520':
configure: tms470: add mapping for -mfpu=vfpv3-d16 flag
configure: recognise Minix as OS
configure: work around bug in ash shell
eval-test: make table static const
lavr: handle clipping in the float to s32 conversion
nut: support pcm codecs not mapped in avi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/eval.c')
| -rw-r--r-- | libavutil/eval.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/eval.c b/libavutil/eval.c index 931ad6bc54..3cea1705c9 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -714,7 +714,8 @@ int main(int argc, char **argv) { int i; double d; - const char **expr, *exprs[] = { + const char *const *expr; + static const char *const exprs[] = { "", "1;2", "-20", |