]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45cc62f d14a26e)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:50:10 +0000 (11:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:50:18 +0000 (11:50 +0200)
* qatar/master:
  wmavoice: conceal clearly corrupted blocks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/wmavoice.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/wmavoice.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.