diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-11 11:50:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-11 11:50:18 +0200 |
| commit | 531f0169444cd6358334daf09417045f8e6ff956 (patch) | |
| tree | fd7fca1993a866f60bd64ef312500cb67c8643d7 /Makefile | |
| parent | 45cc62f0a099b75e75c6a4ad57bca640bd6daf32 (diff) | |
| parent | d14a26edb7c4487df581f11e5c6911dc0e623d08 (diff) | |
| download | ffmpeg-531f0169444cd6358334daf09417045f8e6ff956.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wmavoice: conceal clearly corrupted blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions