Merge commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 07:39:01 +0000 (09:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 07:39:07 +0000 (09:39 +0200)
commit6bf6b9c279ab4049a8c6408f6c5d4c08afa41681
tree63ec77f9c046e0535d714c63dc0944a431eb22de
parentbc1c90eabfa4815c25a258f64ba3283f79b0c50d
parent252c0bfdc014c1fb6ad4fe06242c7beca58a6b41
Merge commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41'

* commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41':
  lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c