Merge commit '82fc9f4b38244236a6ca7f946662ca653044a04c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 17:28:25 +0000 (19:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 17:28:29 +0000 (19:28 +0200)
commitcd7ae5af16d7fc718a34effea3e3fef09a1a8a2e
treec044e273485972168043c8051b5d3407000647d0
parent07941c2cb28d6a80f628e035d61ab437d9719bf0
parent82fc9f4b38244236a6ca7f946662ca653044a04c
Merge commit '82fc9f4b38244236a6ca7f946662ca653044a04c'

* commit '82fc9f4b38244236a6ca7f946662ca653044a04c':
  display: Include mathematics.h for fallback definition of NAN

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/display.c