]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41':
  lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)

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

Simple merge