diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 13:36:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 13:37:46 +0200 |
| commit | 8ff23f0e3c9a6665c34c45b5635c2c149d30b264 (patch) | |
| tree | d7a2d37d3122d1f7886ed8cb27639791870cb197 /common.mak | |
| parent | 2655c1ac1282bbcfd7666e42aaf73014598faad5 (diff) | |
| parent | 5b097399baa2e38cc513939cfab3a9b6fdbc33df (diff) | |
| download | ffmpeg-streaming-8ff23f0e3c9a6665c34c45b5635c2c149d30b264.zip ffmpeg-streaming-8ff23f0e3c9a6665c34c45b5635c2c149d30b264.tar.gz | |
Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df'
* commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df':
eval: Explicitly ignore return value of strtod() in parse_db()
Conflicts:
libavutil/eval.c
See: 3cd9849d9c24b0808e6e55cd7568250acaae2b91
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions
