diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 16:25:23 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 16:34:45 +0400 |
| commit | 99efd596267248ba5eae1b0e540d880368a402c3 (patch) | |
| tree | 1ab9b0250d1350ffaae7d5f2bf98ba78e21d0cf4 /libavutil/eval.c | |
| parent | 1fa2bdc90a4a5309a3bf83ff9ae37f59e5f329fa (diff) | |
| parent | cb45553f577f8e0ebfe05d3287e1b6fa5859b967 (diff) | |
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
Remove pointless #undefs of previously forbidden functions.
fate: Add dependencies for bmp, cdxl, dfa, mp3
Conflicts:
doc/examples/muxing.c
libavfilter/filtfmts.c
libavutil/des.c
libavutil/eval.c
libavutil/log.c
libavutil/parseutils.c
tests/fate/mp3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/eval.c')
| -rw-r--r-- | libavutil/eval.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavutil/eval.c b/libavutil/eval.c index 0d6bd15529..4a27742729 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -660,8 +660,6 @@ int av_expr_parse_and_eval(double *d, const char *s, } #ifdef TEST -// LCOV_EXCL_START -#undef printf #include <string.h> static const double const_values[] = { @@ -797,5 +795,4 @@ int main(int argc, char **argv) return 0; } -// LCOV_EXCL_STOP #endif |