]> git.sesse.net Git - ffmpeg/commitdiff
Merge remote-tracking branch 'dwbuiten/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jul 2012 21:59:57 +0000 (23:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jul 2012 22:00:03 +0000 (00:00 +0200)
* dwbuiten/master:
  wav: Add check for 'fmt' tag in SMV code

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge