Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:36:46 +0000 (13:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:37:46 +0000 (13:37 +0200)
* 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>
1  2 
libavutil/eval.c

@@@ -26,7 -26,7 +26,8 @@@
   * see http://joe.hotchkiss.com/programming/eval/eval.html
   */
  
 +#include <float.h>
+ #include "attributes.h"
  #include "avutil.h"
  #include "common.h"
  #include "eval.h"